Merge branch 'master' into master

jenkinsci · Jan 19, 2025 · e2f1236 · e2f1236
2 parents d5fb28e + 8660cf6
commit e2f1236
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/debian/Dockerfile b/debian/Dockerfile
@@ -19,7 +19,7 @@
 #  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
-ARG DEBIAN_RELEASE=bookworm-20241223
+ARG DEBIAN_RELEASE=bookworm-20250113
 FROM debian:"${DEBIAN_RELEASE}"-slim as jre-build
 
 SHELL ["/bin/bash", "-e", "-u", "-o", "pipefail", "-c"]

diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -72,7 +72,7 @@ variable "JAVA21_VERSION" {
 }
 
 variable "DEBIAN_RELEASE" {
-  default = "bookworm-20241223"
+  default = "bookworm-20250113"
 }
 
 # Set this value to a specific Windows version to override Windows versions to build returned by windowsversions function

diff --git a/tests/sshAgent.Tests.ps1 b/tests/sshAgent.Tests.ps1
@@ -58,7 +58,7 @@ TUwLP4n7pK4J2sCIs6fRD5kEYms4BnddXeRuI2fGZHGH70Ci/Q==
 -----END RSA PRIVATE KEY-----
 "@
 
-$global:GITLFSVERSION = '3.6.0'
+$global:GITLFSVERSION = '3.6.1'
 
 Cleanup($global:CONTAINERNAME)
 

diff --git a/windows/nanoserver/Dockerfile b/windows/nanoserver/Dockerfile
@@ -61,7 +61,7 @@ RUN $javaMajorVersion = $env:JAVA_HOME.Substring($env:JAVA_HOME.Length - 2); `
 
 # Install git
 ARG GIT_VERSION=2.47.1
-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); } `
@@ -77,7 +77,7 @@ ENV WindowsPATH="C:\Windows\system32;C:\Windows"
 ENV PATH="${WindowsPATH};${ProgramFiles}\PowerShell;${JAVA_HOME}\bin;C:\mingit\cmd"
 
 # Install git-lfs
-ARG GIT_LFS_VERSION=3.6.0
+ARG GIT_LFS_VERSION=3.6.1
 RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
     $url = $('https://github.com/git-lfs/git-lfs/releases/download/v{0}/git-lfs-windows-amd64-v{0}.zip' -f $env:GIT_LFS_VERSION) ; `
     Write-Host "Retrieving $url..." ; `

diff --git a/windows/windowsservercore/Dockerfile b/windows/windowsservercore/Dockerfile
@@ -56,7 +56,7 @@ USER ContainerAdministrator
 
 # Install git
 ARG GIT_VERSION=2.47.1
-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); } `
@@ -67,7 +67,7 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
     Remove-Item mingit.zip -Force
 
 # Install git-lfs
-ARG GIT_LFS_VERSION=3.6.0
+ARG GIT_LFS_VERSION=3.6.1
 RUN $CurrentPath = (Get-Itemproperty -path 'hklm:\system\currentcontrolset\control\session manager\environment' -Name Path).Path ; `
     $NewPath = $CurrentPath + ';{0}\bin;C:\mingit\cmd' -f $env:JAVA_HOME ; `
     Set-ItemProperty -path 'hklm:\system\currentcontrolset\control\session manager\environment' -Name Path -Value $NewPath ; `