Skip to content

Commit 5c2d516

Browse files
authored
Merge branch 'master' into updatecli_master_20863217c1acda5d7d19ed8cdce74e32a81b31d946e6c3e439bcd0d0f573f0dd
2 parents 1340327 + 5f3f22c commit 5c2d516

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

windows/nanoserver/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ SHELL ["pwsh.exe", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPrefer
5757
USER ContainerAdministrator
5858

5959
ARG GIT_VERSION=2.47.1
60-
ARG GIT_PATCH_VERSION=1
60+
ARG GIT_PATCH_VERSION=2
6161
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
6262
# The patch "windows.1" always have a different URL than the subsequent patch (ZIP filename is different)
6363
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); } `

windows/windowsservercore/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ COPY --from=jdk-core $JAVA_HOME $JAVA_HOME
4949
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
5050

5151
ARG GIT_VERSION=2.47.1
52-
ARG GIT_PATCH_VERSION=1
52+
ARG GIT_PATCH_VERSION=2
5353
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
5454
# The patch "windows.1" always have a different URL than the subsequent patch (ZIP filename is different)
5555
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); } `

0 commit comments

Comments
 (0)