diff --git a/debian/Dockerfile b/debian/Dockerfile index a75f454d..0f93f83d 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -1,3 +1,4 @@ + # The MIT License # # Copyright (c) 2015-2024, CloudBees, Inc. and other Jenkins contributors @@ -19,7 +20,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-20240423 +ARG DEBIAN_RELEASE=bookworm-20240513 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 d2a6b7ea..af204db1 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -73,7 +73,7 @@ variable "JAVA21_PREVIEW_VERSION" { } variable "DEBIAN_RELEASE" { - default = "bookworm-20240423" + default = "bookworm-20240513" } variable "default_jdk" { @@ -93,7 +93,7 @@ function "javaversion" { ? "${JAVA11_VERSION}" : (equal(17, jdk) ? "${JAVA17_VERSION}" - : "${JAVA21_VERSION}")) + : "${JAVA21_VERSION}")) } # Return an array of Alpine platforms to use depending on the jdk passed as parameter @@ -101,7 +101,7 @@ function "alpine_platforms" { params = [jdk] result = (equal(21, jdk) ? ["linux/amd64", "linux/arm64"] - : ["linux/amd64"]) + : ["linux/amd64"]) } # Return an array of Debian platforms to use depending on the jdk passed as parameter @@ -109,7 +109,7 @@ function "debian_platforms" { params = [jdk] result = (equal(17, jdk) ? ["linux/amd64", "linux/arm64", "linux/ppc64le"] - : ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]) + : ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]) } target "alpine" { diff --git a/windows/nanoserver/Dockerfile b/windows/nanoserver/Dockerfile index 9fb8db58..a89107d2 100644 --- a/windows/nanoserver/Dockerfile +++ b/windows/nanoserver/Dockerfile @@ -60,7 +60,7 @@ RUN $javaMajorVersion = $env:JAVA_HOME.Substring($env:JAVA_HOME.Length - 2); ` New-Item -Path "C:\jdk-${javaMajorVersion}" -ItemType SymbolicLink -Value "${env:JAVA_HOME}" # Install git -ARG GIT_VERSION=2.45.0 +ARG GIT_VERSION=2.45.1 ARG GIT_PATCH_VERSION=1 RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; ` # The patch "windows.1" always have a different URL than the subsequent patch (ZIP filename is different) diff --git a/windows/windowsservercore/Dockerfile b/windows/windowsservercore/Dockerfile index 7d7f4b7c..dfba4c8d 100644 --- a/windows/windowsservercore/Dockerfile +++ b/windows/windowsservercore/Dockerfile @@ -55,7 +55,7 @@ ENV JENKINS_AGENT_WORK ${JENKINS_AGENT_WORK} USER ContainerAdministrator # Install git -ARG GIT_VERSION=2.45.0 +ARG GIT_VERSION=2.45.1 ARG GIT_PATCH_VERSION=1 RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; ` # The patch "windows.1" always have a different URL than the subsequent patch (ZIP filename is different)