Skip to content

Commit

Permalink
Merge pull request #465 from jenkinsci/updatecli_fb78da795f3c7c214177…
Browse files Browse the repository at this point in the history
…35cd0ed3cf3627c1aa571c6a3326dda3d02c2a8d8265

Bump Git version on Windows to 2.41.0.windows.3
  • Loading branch information
dduportal committed Jul 24, 2023
2 parents a50b867 + 9160598 commit b49cad5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion windows/nanoserver/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ SHELL ["pwsh.exe", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPrefer
USER ContainerAdministrator

ARG GIT_VERSION=2.41.0
ARG GIT_PATCH_VERSION=2
ARG GIT_PATCH_VERSION=3
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); } `
Expand Down
2 changes: 1 addition & 1 deletion windows/windowsservercore/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ COPY --from=jdk-core $JAVA_HOME $JAVA_HOME
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

ARG GIT_VERSION=2.41.0
ARG GIT_PATCH_VERSION=2
ARG GIT_PATCH_VERSION=3
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); } `
Expand Down

0 comments on commit b49cad5

Please sign in to comment.