Merge pull request #461 from jenkinsci/updatecli_master_a9b520a64e197…

…15d0db64eef4d745f71c310e6ce8883f842e49b6fe6ca7451aa Bump Git version on Windows to 2.47.0.windows.2
jenkinsci · Oct 22, 2024 · f714279 · f714279
2 parents 32c48e4 + aa731e4
commit f714279
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/windows/nanoserver/Dockerfile b/windows/nanoserver/Dockerfile
@@ -61,7 +61,7 @@ RUN $javaMajorVersion = $env:JAVA_HOME.Substring($env:JAVA_HOME.Length - 2); `
 
 # Install git
 ARG GIT_VERSION=2.47.0
-ARG GIT_PATCH_VERSION=1
+ARG GIT_PATCH_VERSION=2
 RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
     # The patch "windows.1" always have a different URL than the subsequent patch (ZIP filename is different)
     if($env:GIT_PATCH_VERSION -eq 1) { $url = $('https://github.com/git-for-windows/git/releases/download/v{0}.windows.{1}/MinGit-{0}-64-bit.zip' -f $env:GIT_VERSION, $env:GIT_PATCH_VERSION); } `

diff --git a/windows/windowsservercore/Dockerfile b/windows/windowsservercore/Dockerfile
@@ -56,7 +56,7 @@ USER ContainerAdministrator
 
 # Install git
 ARG GIT_VERSION=2.47.0
-ARG GIT_PATCH_VERSION=1
+ARG GIT_PATCH_VERSION=2
 RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
     # The patch "windows.1" always have a different URL than the subsequent patch (ZIP filename is different)
     if($env:GIT_PATCH_VERSION -eq 1) { $url = $('https://github.com/git-for-windows/git/releases/download/v{0}.windows.{1}/MinGit-{0}-64-bit.zip' -f $env:GIT_VERSION, $env:GIT_PATCH_VERSION); } `