Merge branch 'master' into updatecli_master_f6a489d37e8857f35964f836e…

…ece704672730157ea40050f8c93f426069a562c
jenkinsci · Oct 22, 2024 · 0c4e7f4 · 0c4e7f4
2 parents da5d5f8 + a5efe24
commit 0c4e7f4
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
@@ -57,7 +57,7 @@ SHELL ["pwsh.exe", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPrefer
 USER ContainerAdministrator
 
 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
@@ -49,7 +49,7 @@ COPY --from=jdk-core $JAVA_HOME $JAVA_HOME
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
 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); } `