Skip to content

Commit c925718

Browse files
authored
Merge pull request #1010 from jenkinsci/updatecli_master_a9b520a64e19715d0db64eef4d745f71c310e6ce8883f842e49b6fe6ca7451aa
Bump Git version on Windows to 2.50.0.windows.2
2 parents 7442441 + dbfcc7b commit c925718

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

windows/nanoserver/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ COPY --from=pwsh-source $PSHOME $PSHOME
5656
SHELL ["pwsh.exe", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
5757
USER ContainerAdministrator
5858

59-
ARG GIT_VERSION=2.49.0
60-
ARG GIT_PATCH_VERSION=1
59+
ARG GIT_VERSION=2.50.0
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ COPY --from=jdk-core $JAVA_HOME $JAVA_HOME
4848

4949
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
5050

51-
ARG GIT_VERSION=2.49.0
52-
ARG GIT_PATCH_VERSION=1
51+
ARG GIT_VERSION=2.50.0
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)