From aadd15f9814e75d67b0a86f5b818ce0c4d0654c9 Mon Sep 17 00:00:00 2001 From: Andrey Koltsov Date: Fri, 18 Oct 2024 11:05:51 +0200 Subject: [PATCH] Align Git-for-Linux version with host Ubuntu version. (#172) --- configs/linux.config | 2 +- context/generated/linux/Agent/Ubuntu/20.04/Dockerfile | 2 +- context/generated/linux/Agent/UbuntuARM/20.04/Dockerfile | 2 +- context/generated/linux/Server/Ubuntu/20.04/Dockerfile | 2 +- context/generated/linux/Server/UbuntuARM/20.04/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/linux.config b/configs/linux.config index 4000b916..614c3a41 100644 --- a/configs/linux.config +++ b/configs/linux.config @@ -18,7 +18,7 @@ dotnetLinuxComponentName=${dotnetComponentName} x86 Checksum (SHA512) ${dotnetLi # https://packages.ubuntu.com/focal/git # http://ppa.launchpad.net/git-core/ppa/ubuntu/dists/focal/main/binary-amd64/ -gitLinuxComponentVersion=1:2.47.0-0ppa2~ubuntu22.04.1 +gitLinuxComponentVersion=1:2.47.0-0ppa2~ubuntu20.04.1 gitLinuxComponentName=Git v.2.47.0 # https://packages.ubuntu.com/focal/git-lfs diff --git a/context/generated/linux/Agent/Ubuntu/20.04/Dockerfile b/context/generated/linux/Agent/Ubuntu/20.04/Dockerfile index 33d8f97a..4655c774 100644 --- a/context/generated/linux/Agent/Ubuntu/20.04/Dockerfile +++ b/context/generated/linux/Agent/Ubuntu/20.04/Dockerfile @@ -5,7 +5,7 @@ ARG dotnetLibs='libc6 libgcc1 libgssapi-krb5-2 libicu66 libssl1.1 libstdc++6 zli ARG dotnetLinuxComponent='https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-x64.tar.gz' ARG dotnetLinuxComponentSHA512='ee0a77d54e6d4917be7310ff0abb3bad5525bfb4beb1db0c215e65f64eb46511f5f12d6c7ff465a1d4ab38577e6a1950fde479ee94839c50e627020328a702de' ARG gitLFSLinuxComponentVersion='2.9.2-1' -ARG gitLinuxComponentVersion='1:2.47.0-0ppa2~ubuntu22.04.1' +ARG gitLinuxComponentVersion='1:2.47.0-0ppa2~ubuntu20.04.1' ARG p4Version='2022.2-2637361' ARG repo='https://hub.docker.com/r/jetbrains/' ARG teamcityMinimalAgentImage='teamcity-minimal-agent:EAP-linux' diff --git a/context/generated/linux/Agent/UbuntuARM/20.04/Dockerfile b/context/generated/linux/Agent/UbuntuARM/20.04/Dockerfile index 2cd1dd39..a2624f14 100644 --- a/context/generated/linux/Agent/UbuntuARM/20.04/Dockerfile +++ b/context/generated/linux/Agent/UbuntuARM/20.04/Dockerfile @@ -5,7 +5,7 @@ ARG dotnetLibs='libc6 libgcc1 libgssapi-krb5-2 libicu66 libssl1.1 libstdc++6 zli ARG dotnetLinuxARM64Component='https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.413/dotnet-sdk-6.0.413-linux-arm64.tar.gz' ARG dotnetLinuxARM64ComponentSHA512='7f05a9774d79e694da5a6115d9916abf87a65e40bd6bdaa5dca1f705795436bc8e764242f7045207386a86732ef5519f60bdb516a3860e4860bca7ee91a21759' ARG gitLFSLinuxComponentVersion='2.9.2-1' -ARG gitLinuxComponentVersion='1:2.47.0-0ppa2~ubuntu22.04.1' +ARG gitLinuxComponentVersion='1:2.47.0-0ppa2~ubuntu20.04.1' ARG repo='https://hub.docker.com/r/jetbrains/' ARG teamcityMinimalAgentImage='teamcity-minimal-agent:EAP-linux-arm64' diff --git a/context/generated/linux/Server/Ubuntu/20.04/Dockerfile b/context/generated/linux/Server/Ubuntu/20.04/Dockerfile index 2ae62af6..42f024fd 100644 --- a/context/generated/linux/Server/Ubuntu/20.04/Dockerfile +++ b/context/generated/linux/Server/Ubuntu/20.04/Dockerfile @@ -1,6 +1,6 @@ # Default arguments ARG gitLFSLinuxComponentVersion='2.9.2-1' -ARG gitLinuxComponentVersion='1:2.47.0-0ppa2~ubuntu22.04.1' +ARG gitLinuxComponentVersion='1:2.47.0-0ppa2~ubuntu20.04.1' ARG jdkServerLinuxComponent='https://corretto.aws/downloads/resources/17.0.7.7.1/amazon-corretto-17.0.7.7.1-linux-x64.tar.gz' ARG jdkServerLinuxComponentMD5SUM='443750a02c28ff2807c80032ee2e8ebc' ARG p4Version='2022.2-2637361' diff --git a/context/generated/linux/Server/UbuntuARM/20.04/Dockerfile b/context/generated/linux/Server/UbuntuARM/20.04/Dockerfile index 464af585..323ae8ad 100644 --- a/context/generated/linux/Server/UbuntuARM/20.04/Dockerfile +++ b/context/generated/linux/Server/UbuntuARM/20.04/Dockerfile @@ -1,6 +1,6 @@ # Default arguments ARG gitLFSLinuxComponentVersion='2.9.2-1' -ARG gitLinuxComponentVersion='1:2.47.0-0ppa2~ubuntu22.04.1' +ARG gitLinuxComponentVersion='1:2.47.0-0ppa2~ubuntu20.04.1' ARG jdkServerLinuxARM64Component='https://corretto.aws/downloads/resources/17.0.7.7.1/amazon-corretto-17.0.7.7.1-linux-aarch64.tar.gz' ARG jdkServerLinuxARM64ComponentMD5SUM='c55e3d0615fac07f948ac3adaed818e9' ARG repo=''