From 9bc125cbb1f5d3ffa5055495e559640e0be20e87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= Date: Sun, 22 Oct 2023 19:33:29 +0200 Subject: [PATCH 01/14] feat(Linux): switch supported architectures to GA Temurin jdk21 images --- alpine/Dockerfile-jdk21 | 35 ------------------- .../{Dockerfile-jdk21 => preview/Dockerfile} | 0 docker-bake.hcl | 27 ++++++++++---- 3 files changed, 21 insertions(+), 41 deletions(-) delete mode 100644 alpine/Dockerfile-jdk21 rename debian/{Dockerfile-jdk21 => preview/Dockerfile} (100%) diff --git a/alpine/Dockerfile-jdk21 b/alpine/Dockerfile-jdk21 deleted file mode 100644 index 95ea9284..00000000 --- a/alpine/Dockerfile-jdk21 +++ /dev/null @@ -1,35 +0,0 @@ -# The MIT License -# -# Copyright (c) 2015-2020, CloudBees, Inc. and other Jenkins contributors -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# 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 version=3180.v3dd999d24861-1 -ARG JAVA_MAJOR_VERSION=21 -FROM jenkins/agent:"${version}"-alpine-jdk"${JAVA_MAJOR_VERSION}"-preview - -ARG user=jenkins - -USER root -COPY ../../jenkins-agent /usr/local/bin/jenkins-agent -RUN chmod +x /usr/local/bin/jenkins-agent &&\ - ln -s /usr/local/bin/jenkins-agent /usr/local/bin/jenkins-slave -USER ${user} - -ENTRYPOINT ["/usr/local/bin/jenkins-agent"] diff --git a/debian/Dockerfile-jdk21 b/debian/preview/Dockerfile similarity index 100% rename from debian/Dockerfile-jdk21 rename to debian/preview/Dockerfile diff --git a/docker-bake.hcl b/docker-bake.hcl index 63d90203..ce986b05 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -86,16 +86,16 @@ target "alpine_jdk17" { } target "alpine_jdk21" { - dockerfile = "alpine/Dockerfile-jdk21" + dockerfile = "alpine/Dockerfile" context = "." args = { JAVA_MAJOR_VERSION = "21" version = "${PARENT_IMAGE_VERSION}" } tags = [ - equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${PARENT_IMAGE_VERSION}-alpine-jdk21-preview" : "", - "${REGISTRY}/${JENKINS_REPO}:alpine-jdk21-preview", - "${REGISTRY}/${JENKINS_REPO}:latest-alpine-jdk21-preview", + equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${PARENT_IMAGE_VERSION}-alpine-jdk21" : "", + "${REGISTRY}/${JENKINS_REPO}:alpine-jdk21", + "${REGISTRY}/${JENKINS_REPO}:latest-alpine-jdk21", ] platforms = ["linux/amd64", "linux/arm64"] } @@ -133,7 +133,22 @@ target "debian_jdk17" { } target "debian_jdk21" { - dockerfile = "debian/Dockerfile-jdk21" + dockerfile = "debian/Dockerfile" + context = "." + args = { + JAVA_MAJOR_VERSION = "21" + version = "${PARENT_IMAGE_VERSION}" + } + tags = [ + equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${PARENT_IMAGE_VERSION}-jdk21" : "", + "${REGISTRY}/${JENKINS_REPO}:jdk21", + "${REGISTRY}/${JENKINS_REPO}:latest-jdk21", + ] + platforms = ["linux/amd64", "linux/arm64"] +} + +target "debian_jdk21_preview" { + dockerfile = "debian/preview/Dockerfile" context = "." args = { JAVA_MAJOR_VERSION = "21" @@ -144,5 +159,5 @@ target "debian_jdk21" { "${REGISTRY}/${JENKINS_REPO}:jdk21-preview", "${REGISTRY}/${JENKINS_REPO}:latest-jdk21-preview", ] - platforms = ["linux/amd64", "linux/arm64", "linux/ppc64le"] + platforms = ["linux/ppc64le", "linux/s390x", "linux/arm/v7"] } From f052b3e1ca3b31cbee3cc6c539df2519263aeeac Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 22 Oct 2023 20:12:33 +0000 Subject: [PATCH 02/14] chore: Bump the parent image `jenkins/agent` version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli, rebased by lemeurherve --- alpine/Dockerfile | 2 +- build.ps1 | 2 +- debian/Dockerfile | 2 +- debian/preview/Dockerfile | 2 +- docker-bake.hcl | 2 +- windows/nanoserver/Dockerfile | 2 +- windows/windowsservercore/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index c4fbf990..911033a5 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -ARG version=3180.v3dd999d24861-1 +ARG version=3180.v3dd999d24861-2 ARG JAVA_MAJOR_VERSION=17 FROM jenkins/agent:"${version}"-alpine-jdk"${JAVA_MAJOR_VERSION}" diff --git a/build.ps1 b/build.ps1 index 563ce767..4efc2b7f 100644 --- a/build.ps1 +++ b/build.ps1 @@ -4,7 +4,7 @@ Param( [String] $Target = "build", [String] $Build = '', [String] $VersionTag = 'NEXT_TAG_VERSION', - [String] $ParentImageVersion = '3180.v3dd999d24861-1', + [String] $ParentImageVersion = '3180.v3dd999d24861-2', [switch] $PushVersions = $false ) diff --git a/debian/Dockerfile b/debian/Dockerfile index 70fcf6f6..e88c18d8 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -1,4 +1,4 @@ -ARG version=3180.v3dd999d24861-1 +ARG version=3180.v3dd999d24861-2 ARG JAVA_MAJOR_VERSION=17 FROM jenkins/agent:"${version}"-jdk"${JAVA_MAJOR_VERSION}" diff --git a/debian/preview/Dockerfile b/debian/preview/Dockerfile index 2a46ffd2..6319a712 100644 --- a/debian/preview/Dockerfile +++ b/debian/preview/Dockerfile @@ -1,4 +1,4 @@ -ARG version=3180.v3dd999d24861-1 +ARG version=3180.v3dd999d24861-2 ARG JAVA_MAJOR_VERSION=21 FROM jenkins/agent:"${version}"-jdk"${JAVA_MAJOR_VERSION}-preview" diff --git a/docker-bake.hcl b/docker-bake.hcl index ce986b05..c5a0b763 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -37,7 +37,7 @@ variable "IMAGE_TAG" { #### This is for the "parent" image version to use (jenkins/agent:-) variable "PARENT_IMAGE_VERSION" { - default = "3180.v3dd999d24861-1" + default = "3180.v3dd999d24861-2" } variable "REGISTRY" { diff --git a/windows/nanoserver/Dockerfile b/windows/nanoserver/Dockerfile index 966dc033..823cf20c 100644 --- a/windows/nanoserver/Dockerfile +++ b/windows/nanoserver/Dockerfile @@ -21,7 +21,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -ARG version=3180.v3dd999d24861-1 +ARG version=3180.v3dd999d24861-2 ARG JAVA_MAJOR_VERSION=17 ARG WINDOWS_VERSION_TAG=1809 FROM jenkins/agent:"${version}"-jdk"${JAVA_MAJOR_VERSION}"-nanoserver-"${WINDOWS_VERSION_TAG}" diff --git a/windows/windowsservercore/Dockerfile b/windows/windowsservercore/Dockerfile index c54bd37e..5a03f1e9 100644 --- a/windows/windowsservercore/Dockerfile +++ b/windows/windowsservercore/Dockerfile @@ -21,7 +21,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -ARG version=3180.v3dd999d24861-1 +ARG version=3180.v3dd999d24861-2 ARG JAVA_MAJOR_VERSION=17 ARG WINDOWS_VERSION_TAG=ltsc2019 FROM jenkins/agent:"${version}"-jdk"${JAVA_MAJOR_VERSION}"-windowsservercore-"${WINDOWS_VERSION_TAG}" From 055ae83ee3541d0281c4dced0b96f9130342f6fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= Date: Sun, 22 Oct 2023 22:21:08 +0200 Subject: [PATCH 03/14] Keep linux/amd64 and linux/arm64 architectures for debian_jdk21_preview target in docker-bake so this target is picked up by the Makefile --- docker-bake.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index c5a0b763..a93e621b 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -159,5 +159,5 @@ target "debian_jdk21_preview" { "${REGISTRY}/${JENKINS_REPO}:jdk21-preview", "${REGISTRY}/${JENKINS_REPO}:latest-jdk21-preview", ] - platforms = ["linux/ppc64le", "linux/s390x", "linux/arm/v7"] + platforms = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x", "linux/arm/v7"] } From 2620a89e0d40546f3d019171869f1e9a1664eee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= Date: Sun, 22 Oct 2023 22:22:10 +0200 Subject: [PATCH 04/14] add debian_jdk21-preview target to the linux group in docker-bake --- docker-bake.hcl | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-bake.hcl b/docker-bake.hcl index a93e621b..71c902e2 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -6,6 +6,7 @@ group "linux" { "debian_jdk11", "debian_jdk17", "debian_jdk21", + "debian_jdk21_preview", ] } From fe6a0234872b6c9213e548926bc53835fc5dbc38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= Date: Sun, 22 Oct 2023 22:25:33 +0200 Subject: [PATCH 05/14] complete groups --- docker-bake.hcl | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index 71c902e2..18f0f07b 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -16,18 +16,30 @@ group "linux-arm64" { "debian_jdk17", "debian_jdk21", "alpine_jdk21", + "debian_jdk21_preview", + ] +} + +group "linux-arm32" { + targets = [ + "debian_jdk11",, + "debian_jdk17",, + "debian_jdk21_preview", ] } group "linux-s390x" { - targets = [] + targets = [ + "debian_jdk11" + "debian_jdk21_preview" + ] } group "linux-ppc64le" { targets = [ "debian_jdk11", "debian_jdk17", - "debian_jdk21", + "debian_jdk21_preview", ] } From 78aa5e208a35c35a4148b14752833889c52cdd59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= Date: Sun, 22 Oct 2023 22:28:39 +0200 Subject: [PATCH 06/14] fix groups commas --- docker-bake.hcl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index 18f0f07b..30ec4624 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -22,16 +22,16 @@ group "linux-arm64" { group "linux-arm32" { targets = [ - "debian_jdk11",, - "debian_jdk17",, + "debian_jdk11", + "debian_jdk17", "debian_jdk21_preview", ] } group "linux-s390x" { targets = [ - "debian_jdk11" - "debian_jdk21_preview" + "debian_jdk11", + "debian_jdk21_preview", ] } From 5c7bf97433600ca2a37281440179f66acda69454 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= <91831478+lemeurherve@users.noreply.github.com> Date: Sun, 22 Oct 2023 22:35:15 +0200 Subject: [PATCH 07/14] Add "-preview" prefix in debian/preview/Dockerfile --- debian/preview/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/preview/Dockerfile b/debian/preview/Dockerfile index 6319a712..5e45facc 100644 --- a/debian/preview/Dockerfile +++ b/debian/preview/Dockerfile @@ -1,4 +1,4 @@ -ARG version=3180.v3dd999d24861-2 +ARG version=3180.v3dd999d24861-2-preview ARG JAVA_MAJOR_VERSION=21 FROM jenkins/agent:"${version}"-jdk"${JAVA_MAJOR_VERSION}-preview" From 5e397cf0d3624cde9154c1305556ebb113c8e2b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= Date: Sun, 22 Oct 2023 22:46:21 +0200 Subject: [PATCH 08/14] Revert "Keep linux/amd64 and linux/arm64 architectures for debian_jdk21_preview target in docker-bake so this target is picked up by the Makefile" This reverts commit 055ae83ee3541d0281c4dced0b96f9130342f6fc. --- docker-bake.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index 30ec4624..4a9e52ee 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -172,5 +172,5 @@ target "debian_jdk21_preview" { "${REGISTRY}/${JENKINS_REPO}:jdk21-preview", "${REGISTRY}/${JENKINS_REPO}:latest-jdk21-preview", ] - platforms = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x", "linux/arm/v7"] + platforms = ["linux/ppc64le", "linux/s390x", "linux/arm/v7"] } From b6ac5c02f293a2153174d554b3db3d7b30c6b1c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= Date: Sun, 22 Oct 2023 23:01:35 +0200 Subject: [PATCH 09/14] fix linux tests by bumpiung the reference version containing all tags --- tests/tests.bats | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/tests.bats b/tests/tests.bats index e81fb4b5..30dc0bba 100755 --- a/tests/tests.bats +++ b/tests/tests.bats @@ -49,8 +49,8 @@ SUT_IMAGE="$(get_sut_image)" # Old version used to test overriding the build arguments. # This old version must have the same tag suffixes as the ones defined in the docker-bake file (`-jdk17`, `jdk11`, etc.) - TEST_VERSION="3148.v532a_7e715ee3" - PARENT_IMAGE_VERSION_SUFFIX="4" + TEST_VERSION="3180.v3dd999d24861" + PARENT_IMAGE_VERSION_SUFFIX="2" ARG_TEST_VERSION="${TEST_VERSION}-${PARENT_IMAGE_VERSION_SUFFIX}" TEST_USER="root" From db60363d85cf44a80d3cf4584a592786f8c0b075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= <91831478+lemeurherve@users.noreply.github.com> Date: Sun, 22 Oct 2023 22:11:51 +0200 Subject: [PATCH 10/14] fix(updatecli): check preview parent images only for some architectures (#437) * fix(updatecli): check preview parent images only for some architectures * Update docker-agent.yaml --- updatecli/updatecli.d/docker-agent.yaml | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/updatecli/updatecli.d/docker-agent.yaml b/updatecli/updatecli.d/docker-agent.yaml index 1eef680f..06e3db79 100644 --- a/updatecli/updatecli.d/docker-agent.yaml +++ b/updatecli/updatecli.d/docker-agent.yaml @@ -44,17 +44,17 @@ conditions: tag: '{{source "lastVersion" }}-alpine-jdk17' checkJdk21AlpineDockerImage: kind: dockerimage - name: Check if the container image "jenkins/agent:-alpine-jdk21-preview" for linux/amd64 is available + name: Check if the container image "jenkins/agent:-alpine-jdk21" for linux/amd64 is available disablesourceinput: true spec: architectures: - amd64 - arm64 image: jenkins/agent - tag: '{{source "lastVersion" }}-alpine-jdk21-preview' + tag: '{{source "lastVersion" }}-alpine-jdk21' checkJdk11DebianDockerImages: kind: dockerimage - name: Check if the container image "jenkins/agent:-jdk11" for linux/amd64 is available + name: Check if the container image "jenkins/agent:-jdk11" for linux/amd64, linux/arm64, linux/arm/v7, s390x and ppc64le is available disablesourceinput: true spec: architectures: @@ -67,7 +67,7 @@ conditions: tag: '{{source "lastVersion" }}-jdk11' checkJdk17DebianDockerImages: kind: dockerimage - name: Check if the container image "jenkins/agent:-jdk17" for linux/amd64 is available + name: Check if the container image "jenkins/agent:-jdk17" for linux/amd64, linux/arm64 & linux/arm/v7 is available disablesourceinput: true spec: architectures: @@ -78,13 +78,24 @@ conditions: tag: '{{source "lastVersion" }}-jdk17' checkJdk21DebianDockerImages: kind: dockerimage - name: Check if the container image "jenkins/agent:-jdk21-preview" for linux/amd64 is available + name: Check if the container image "jenkins/agent:-jdk21-preview" for linux/amd64 & linux/arm64 is available disablesourceinput: true spec: architectures: - amd64 - arm64 image: jenkins/agent + tag: '{{source "lastVersion" }}-jdk21' + checkJdk21DebianPreviewDockerImages: + kind: dockerimage + name: Check if the container image "jenkins/agent:-jdk21-preview" for ppc64le, linux/arm/v7 and s390x is available + disablesourceinput: true + spec: + architectures: + - ppc64le + - linux/arm/v7 + - s390x + image: jenkins/agent tag: '{{source "lastVersion" }}-jdk21-preview' checkJdk11WindowsNanoserver1809DockerImage: kind: dockerimage From 80d20f5772c8eae4cc23eb5e0a9dd228d06ec62e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= <91831478+lemeurherve@users.noreply.github.com> Date: Sun, 22 Oct 2023 22:41:06 +0200 Subject: [PATCH 11/14] fixup(updatecli): add `-preview` suffix to parent image version in jdk21-preview Dockerfiles (#439) --- updatecli/updatecli.d/docker-agent.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/updatecli/updatecli.d/docker-agent.yaml b/updatecli/updatecli.d/docker-agent.yaml index 06e3db79..60db9e61 100644 --- a/updatecli/updatecli.d/docker-agent.yaml +++ b/updatecli/updatecli.d/docker-agent.yaml @@ -164,6 +164,8 @@ targets: instruction: keyword: ARG matcher: version + transformers: + - addsuffix: "-preview" scmid: default setDebianDockerImage: name: Bump the parent image `jenkins/agent` version on Debian @@ -182,6 +184,8 @@ targets: instruction: keyword: ARG matcher: version + transformers: + - addsuffix: "-preview" scmid: default setsNanoserverDockerImage: name: Bump the parent image `jenkins/agent` version on Windows Nanoserver From 6c152faef282efce4cd0f9e9aa1641cf5ef0ac0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= Date: Sun, 22 Oct 2023 23:08:46 +0200 Subject: [PATCH 12/14] fix PARENT_IMAGE_VERSION suffix for debian_jdk21_preview target in docker-bake --- docker-bake.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index 4a9e52ee..1c145d02 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -165,7 +165,7 @@ target "debian_jdk21_preview" { context = "." args = { JAVA_MAJOR_VERSION = "21" - version = "${PARENT_IMAGE_VERSION}" + version = "${PARENT_IMAGE_VERSION}-preview" } tags = [ equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${PARENT_IMAGE_VERSION}-jdk21-preview" : "", From 54b2e1204cd5075278212f76aef1333900964b63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= Date: Sun, 22 Oct 2023 23:08:58 +0200 Subject: [PATCH 13/14] adapt updatecli manifest --- updatecli/updatecli.d/docker-agent.yaml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/updatecli/updatecli.d/docker-agent.yaml b/updatecli/updatecli.d/docker-agent.yaml index 60db9e61..f9997451 100644 --- a/updatecli/updatecli.d/docker-agent.yaml +++ b/updatecli/updatecli.d/docker-agent.yaml @@ -156,17 +156,6 @@ targets: keyword: ARG matcher: version scmid: default - setAlpine21PreviewDockerImage: - name: Bump the parent image `jenkins/agent` version on Alpine - kind: dockerfile - spec: - file: alpine/Dockerfile-jdk21 - instruction: - keyword: ARG - matcher: version - transformers: - - addsuffix: "-preview" - scmid: default setDebianDockerImage: name: Bump the parent image `jenkins/agent` version on Debian kind: dockerfile @@ -180,7 +169,7 @@ targets: name: Bump the parent image `jenkins/agent` version on Debian kind: dockerfile spec: - file: debian/Dockerfile-jdk21 + file: debian/preview/Dockerfile instruction: keyword: ARG matcher: version From 97426b27a17b176e2ba7e3defbfbb0ba13b083f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= Date: Sun, 22 Oct 2023 23:11:02 +0200 Subject: [PATCH 14/14] fix groups --- docker-bake.hcl | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index 1c145d02..d333f061 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -6,17 +6,15 @@ group "linux" { "debian_jdk11", "debian_jdk17", "debian_jdk21", - "debian_jdk21_preview", ] } group "linux-arm64" { targets = [ + "alpine_jdk21", "debian_jdk11", "debian_jdk17", "debian_jdk21", - "alpine_jdk21", - "debian_jdk21_preview", ] }