From c046dd78d21886459bd3c9aae1e252772f4a88fa Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 07:50:54 +0100 Subject: [PATCH] Bump Debian Bookworm Linux version to bookworm-20240612 (#820) Co-authored-by: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> --- debian/Dockerfile | 2 +- debian/preview/Dockerfile | 2 +- docker-bake.hcl | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/Dockerfile b/debian/Dockerfile index 163b0d5d2..13732c932 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-20240513 +ARG DEBIAN_RELEASE=bookworm-20240612 FROM debian:"${DEBIAN_RELEASE}"-slim as jre-build SHELL ["/bin/bash", "-e", "-u", "-o", "pipefail", "-c"] diff --git a/debian/preview/Dockerfile b/debian/preview/Dockerfile index 52e1ee61c..91683d547 100644 --- a/debian/preview/Dockerfile +++ b/debian/preview/Dockerfile @@ -1,4 +1,4 @@ -ARG DEBIAN_RELEASE=bookworm-20240513 +ARG DEBIAN_RELEASE=bookworm-20240612 FROM debian:"${DEBIAN_RELEASE}"-slim as jre-build ARG JAVA_VERSION ARG TARGETPLATFORM diff --git a/docker-bake.hcl b/docker-bake.hcl index df930066b..df9155430 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -97,7 +97,7 @@ variable "ALPINE_SHORT_TAG" { } variable "DEBIAN_RELEASE" { - default = "bookworm-20240513" + default = "bookworm-20240612" } variable "JAVA11_VERSION" { @@ -138,7 +138,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 @@ -146,7 +146,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 @@ -156,13 +156,13 @@ function "debian_platforms" { ? ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/arm/v7", "linux/s390x"] : (equal(17, jdk) ? ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/arm/v7"] - : ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"])) + : ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"])) } target "alpine" { matrix = { type = ["agent", "inbound-agent"] - jdk = [11, 17, 21] + jdk = [11, 17, 21] } name = "${type}_alpine_jdk${jdk}" target = type @@ -196,7 +196,7 @@ target "alpine" { target "debian" { matrix = { type = ["agent", "inbound-agent"] - jdk = [11, 17, 21] + jdk = [11, 17, 21] } name = "${type}_debian_${jdk}" target = type