Update Git within Linux and Windows-based images. (#175)

JetBrains · Nov 26, 2024 · b249d32 · b249d32
1 parent c1abb33
commit b249d32
Show file tree

Hide file tree

Showing 22 changed files with 62 additions and 62 deletions.
diff --git a/configs/linux.config b/configs/linux.config
@@ -18,8 +18,8 @@ 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
-gitLinuxComponentName=Git v.2.47.0
+gitLinuxComponentVersion=1:2.47.1-0ppa1~ubuntu22.04.1
+gitLinuxComponentName=Git v.2.47.1
 
 # https://packages.ubuntu.com/focal/git-lfs
 gitLFSLinuxComponentVersion=3.0.2-1

diff --git a/configs/windows.config b/configs/windows.config
@@ -1,9 +1,9 @@
 windowsPlatform=windows
 
 # https://github.com/git-for-windows/git/releases/
-gitWindowsComponent=https://${proxyUrl}github.com/git-for-windows/git/releases/download/v2.47.0.windows.1/MinGit-2.47.0-64-bit.zip
-gitWindowsComponentSHA256=6b175d4675bfa7014ba649e3c0976da2a281d89bd9a096f1f41437f9995497a8
-gitWindowsComponentName=Git x64 v.2.47.0 Checksum (SHA256) ${gitWindowsComponentSHA256}
+gitWindowsComponent=https://${proxyUrl}github.com/git-for-windows/git/releases/download/v2.47.1.windows.1/MinGit-2.47.1-64-bit.zip
+gitWindowsComponentSHA256=50b04b55425b5c465d076cdb184f63a0cd0f86f6ec8bb4d5860114a713d2c29a
+gitWindowsComponentName=Git x64 v.2.47.1 Checksum (SHA256) ${gitWindowsComponentSHA256}
 
 # https://github.com/corretto/corretto-17/releases
 jdkServerWindowsComponentMD5SUM=feb7eab99c647a0b4347be9f0a3276de

diff --git 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='3.0.2-1'
-ARG gitLinuxComponentVersion='1:2.47.0-0ppa2~ubuntu22.04.1'
+ARG gitLinuxComponentVersion='1:2.47.1-0ppa1~ubuntu22.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/Ubuntu/22.04/Dockerfile b/context/generated/linux/Agent/Ubuntu/22.04/Dockerfile
@@ -5,7 +5,7 @@ ARG dotnetLibs='libc6 libgcc1 libgssapi-krb5-2 libicu70 libssl3 libstdc++6 zlib1
 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='3.0.2-1'
-ARG gitLinuxComponentVersion='1:2.47.0-0ppa2~ubuntu22.04.1'
+ARG gitLinuxComponentVersion='1:2.47.1-0ppa1~ubuntu22.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
@@ -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='3.0.2-1'
-ARG gitLinuxComponentVersion='1:2.47.0-0ppa2~ubuntu22.04.1'
+ARG gitLinuxComponentVersion='1:2.47.1-0ppa1~ubuntu22.04.1'
 ARG repo='https://hub.docker.com/r/jetbrains/'
 ARG teamcityMinimalAgentImage='teamcity-minimal-agent:EAP-linux-arm64'
 

diff --git a/context/generated/linux/Agent/UbuntuARM/22.04/Dockerfile b/context/generated/linux/Agent/UbuntuARM/22.04/Dockerfile
@@ -5,7 +5,7 @@ ARG dotnetLibs='libc6 libgcc1 libgssapi-krb5-2 libicu70 libssl3 libstdc++6 zlib1
 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='3.0.2-1'
-ARG gitLinuxComponentVersion='1:2.47.0-0ppa2~ubuntu22.04.1'
+ARG gitLinuxComponentVersion='1:2.47.1-0ppa1~ubuntu22.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
@@ -1,6 +1,6 @@
 # Default arguments
 ARG gitLFSLinuxComponentVersion='3.0.2-1'
-ARG gitLinuxComponentVersion='1:2.47.0-0ppa2~ubuntu22.04.1'
+ARG gitLinuxComponentVersion='1:2.47.1-0ppa1~ubuntu22.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/Ubuntu/22.04/Dockerfile b/context/generated/linux/Server/Ubuntu/22.04/Dockerfile
@@ -1,6 +1,6 @@
 # Default arguments
 ARG gitLFSLinuxComponentVersion='3.0.2-1'
-ARG gitLinuxComponentVersion='1:2.47.0-0ppa2~ubuntu22.04.1'
+ARG gitLinuxComponentVersion='1:2.47.1-0ppa1~ubuntu22.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'
@@ -90,7 +90,7 @@ COPY run-server-services.sh /run-services.sh
 
 RUN chmod +x /welcome.sh /run-server.sh /run-services.sh && sync && \
     groupadd -g 1000 tcuser && \
-    useradd -r -u 1000 -g tcuser -d $TEAMCITY_DIST tcuser && \
+    useradd -r -m -u 1000 -g tcuser -d $TEAMCITY_DIST tcuser && \
     echo '[ ! -z "$TERM" -a -x /welcome.sh -a -x /welcome.sh ] && /welcome.sh' >> /etc/bash.bashrc && \
     sed -i -e 's/\r$//' /welcome.sh && \
     sed -i -e 's/\r$//' /run-server.sh && \

diff --git 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='3.0.2-1'
-ARG gitLinuxComponentVersion='1:2.47.0-0ppa2~ubuntu22.04.1'
+ARG gitLinuxComponentVersion='1:2.47.1-0ppa1~ubuntu22.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=''

diff --git a/context/generated/linux/Server/UbuntuARM/22.04/Dockerfile b/context/generated/linux/Server/UbuntuARM/22.04/Dockerfile
@@ -1,6 +1,6 @@
 # Default arguments
 ARG gitLFSLinuxComponentVersion='3.0.2-1'
-ARG gitLinuxComponentVersion='1:2.47.0-0ppa2~ubuntu22.04.1'
+ARG gitLinuxComponentVersion='1:2.47.1-0ppa1~ubuntu22.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=''
@@ -80,7 +80,7 @@ COPY run-server-services.sh /run-services.sh
 
 RUN chmod +x /welcome.sh /run-server.sh /run-services.sh && sync && \
     groupadd -g 1000 tcuser && \
-    useradd -r -u 1000 -g tcuser tcuser && \
+    useradd -r -m -u 1000 -g tcuser tcuser && \
     echo '[ ! -z "$TERM" -a -x /welcome.sh -a -x /welcome.sh ] && /welcome.sh' >> /etc/bash.bashrc && \
     sed -i -e 's/\r$//' /welcome.sh && \
     sed -i -e 's/\r$//' /run-server.sh && \