Skip to content

Commit 384544c

Browse files
authored
Merge pull request #528 from jenkinsci/updatecli_master_a9b520a64e19715d0db64eef4d745f71c310e6ce8883f842e49b6fe6ca7451aa
Bump Git version on Windows to 2.50.0.windows.2
2 parents 78a7ab2 + a93446f commit 384544c

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
@@ -60,8 +60,8 @@ RUN $javaMajorVersion = $env:JAVA_HOME.Substring($env:JAVA_HOME.Length - 2); `
6060
New-Item -Path "C:\jdk-${javaMajorVersion}" -ItemType SymbolicLink -Value "${env:JAVA_HOME}"
6161

6262
# Install git
63-
ARG GIT_VERSION=2.49.0
64-
ARG GIT_PATCH_VERSION=1
63+
ARG GIT_VERSION=2.50.0
64+
ARG GIT_PATCH_VERSION=2
6565
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
6666
# The patch "windows.1" always have a different URL than the subsequent patch (ZIP filename is different)
6767
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
@@ -55,8 +55,8 @@ ENV JENKINS_AGENT_WORK=${JENKINS_AGENT_WORK}
5555
USER ContainerAdministrator
5656

5757
# Install git
58-
ARG GIT_VERSION=2.49.0
59-
ARG GIT_PATCH_VERSION=1
58+
ARG GIT_VERSION=2.50.0
59+
ARG GIT_PATCH_VERSION=2
6060
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
6161
# The patch "windows.1" always have a different URL than the subsequent patch (ZIP filename is different)
6262
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)