From 96a6afb3c38fd910c689c989be299779211cbdcb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 18 Jan 2025 13:01:42 +0000 Subject: [PATCH 1/3] Bump Git version on Windows to 2.47.1.windows.2 (#484) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update the Git Package Windows patch for Windows Server Core Made with ❤️️ by updatecli * chore: Update the Git Package Windows patch for Windows Nanoserver Made with ❤️️ by updatecli --------- Co-authored-by: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> --- windows/nanoserver/Dockerfile | 2 +- windows/windowsservercore/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/nanoserver/Dockerfile b/windows/nanoserver/Dockerfile index 0b02c12e..cf3a2abf 100644 --- 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); } ` diff --git a/windows/windowsservercore/Dockerfile b/windows/windowsservercore/Dockerfile index 6a8801a8..a514b8ba 100644 --- 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); } ` From aeefeef24aad6dde56763368a8c6130dd82421c0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 18 Jan 2025 13:02:01 +0000 Subject: [PATCH 2/3] Bump `git-lfs` version on Windows to 3.6.1 (#483) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update the `git-lfs` Windows version in tests Made with ❤️️ by updatecli * chore: Update the `git-lfs` Windows version for Windows Nanoserver Made with ❤️️ by updatecli * chore: Update the `git-lfs` Windows version for Windows Core Server Made with ❤️️ by updatecli --------- Co-authored-by: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> --- tests/sshAgent.Tests.ps1 | 2 +- windows/nanoserver/Dockerfile | 2 +- windows/windowsservercore/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/sshAgent.Tests.ps1 b/tests/sshAgent.Tests.ps1 index f746862d..39b78fc3 100644 --- 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 index cf3a2abf..cf2cc33b 100644 --- a/windows/nanoserver/Dockerfile +++ b/windows/nanoserver/Dockerfile @@ -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 index a514b8ba..b5f370c4 100644 --- a/windows/windowsservercore/Dockerfile +++ b/windows/windowsservercore/Dockerfile @@ -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 ; ` From 8660cf64cd87f885d4c4039e02da5d2b7628b922 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 18 Jan 2025 06:12:02 -0700 Subject: [PATCH 3/3] Bump Debian Bookworm Linux version to bookworm-20250113 (#482) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update the default value of the variable DEBIAN_RELEASE in the... ... docker-bake.hcl Made with ❤️️ by updatecli * chore: Update the value of the base image (ARG DEBIAN_RELEASE) in the... ... Dockerfile Made with ❤️️ by updatecli --------- Co-authored-by: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> --- debian/Dockerfile | 2 +- docker-bake.hcl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/Dockerfile b/debian/Dockerfile index 4d0ed222..233ff8b1 100644 --- 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 index 09ac4b87..1bb457c6 100644 --- 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