From 6a39a2837ce032554a7c9a6fb087558060ccc786 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 13:04:31 +0200 Subject: [PATCH 1/2] chore(updatecli): rename `bullseye.yaml` to `debian.yaml` --- updatecli/updatecli.d/{bullseye.yaml => debian.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename updatecli/updatecli.d/{bullseye.yaml => debian.yaml} (100%) diff --git a/updatecli/updatecli.d/bullseye.yaml b/updatecli/updatecli.d/debian.yaml similarity index 100% rename from updatecli/updatecli.d/bullseye.yaml rename to updatecli/updatecli.d/debian.yaml From 544eda3176209d1be2d04d212919d98b81fc011a 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 14:19:44 +0200 Subject: [PATCH 2/2] fix(updatecli/debian): add new jdk21 and jdk21-preview conditions and targets (#1744) * chore(updatecli): fix debian manifest * new jdk21 and preview conditions and targets * rename label * fix unique condition name * fix: rename tagFilter to tagfilter --- updatecli/updatecli.d/debian.yaml | 97 +++++++++++++++++++++++++++---- 1 file changed, 87 insertions(+), 10 deletions(-) diff --git a/updatecli/updatecli.d/debian.yaml b/updatecli/updatecli.d/debian.yaml index 7b21b440f6..32748a039b 100644 --- a/updatecli/updatecli.d/debian.yaml +++ b/updatecli/updatecli.d/debian.yaml @@ -21,7 +21,7 @@ sources: - trimprefix: "bookworm-" spec: image: "debian" - tagFilter: "bookworm-*" + tagfilter: "bookworm-*" versionfilter: kind: regex pattern: >- @@ -33,7 +33,7 @@ sources: - trimprefix: "bookworm-" spec: image: "debian" - tagFilter: "bookworm-*" + tagfilter: "bookworm-*" versionfilter: kind: regex pattern: >- @@ -49,21 +49,21 @@ conditions: instruction: keyword: "ARG" matcher: "BOOKWORM_TAG" - testDockerfileArgJDK17: + testDockerfileArgJDK11Slim: name: "Does the Dockerfile have an ARG instruction for the Debian Bookworm Linux version?" kind: dockerfile disablesourceinput: true spec: - file: 17/debian/bookworm/hotspot/Dockerfile + file: 11/debian/bookworm-slim/hotspot/Dockerfile instruction: keyword: "ARG" matcher: "BOOKWORM_TAG" - testDockerfileArgJDK11Slim: + testDockerfileArgJDK17: name: "Does the Dockerfile have an ARG instruction for the Debian Bookworm Linux version?" kind: dockerfile disablesourceinput: true spec: - file: 11/debian/bookworm-slim/hotspot/Dockerfile + file: 17/debian/bookworm/hotspot/Dockerfile instruction: keyword: "ARG" matcher: "BOOKWORM_TAG" @@ -76,6 +76,42 @@ conditions: instruction: keyword: "ARG" matcher: "BOOKWORM_TAG" + testDockerfileArgJDK21: + name: "Does the Dockerfile have an ARG instruction for the Debian Bookworm Linux version?" + kind: dockerfile + disablesourceinput: true + spec: + file: 21/debian/bookworm/hotspot/Dockerfile + instruction: + keyword: "ARG" + matcher: "BOOKWORM_TAG" + testDockerfileArgJDK21Slim: + name: "Does the Dockerfile have an ARG instruction for the Debian Bookworm Linux version?" + kind: dockerfile + disablesourceinput: true + spec: + file: 21/debian/bookworm-slim/hotspot/Dockerfile + instruction: + keyword: "ARG" + matcher: "BOOKWORM_TAG" + testDockerfileArgJDK21Preview: + name: "Does the Dockerfile have an ARG instruction for the Debian Bookworm Linux version?" + kind: dockerfile + disablesourceinput: true + spec: + file: 21/debian/bookworm/hotspot/preview/Dockerfile + instruction: + keyword: "ARG" + matcher: "BOOKWORM_TAG" + testDockerfileArgJDK21SlimPreview: + name: "Does the Dockerfile have an ARG instruction for the Debian Bookworm Linux version?" + kind: dockerfile + disablesourceinput: true + spec: + file: 21/debian/bookworm-slim/hotspot/preview/Dockerfile + instruction: + keyword: "ARG" + matcher: "BOOKWORM_TAG" testVersionInBakeFile: name: "Does the bake file have variable BOOKWORM_TAG" kind: file @@ -95,22 +131,22 @@ targets: keyword: "ARG" matcher: "BOOKWORM_TAG" scmid: default - updateDockerfileJDK17: + updateDockerfileJDK11Slim: name: "Update the value of the base image (ARG BOOKWORM_TAG) in the Dockerfile" kind: dockerfile sourceid: bookwormLatestVersion spec: - file: 17/debian/bookworm/hotspot/Dockerfile + file: 11/debian/bookworm-slim/hotspot/Dockerfile instruction: keyword: "ARG" matcher: "BOOKWORM_TAG" scmid: default - updateDockerfileJDK11Slim: + updateDockerfileJDK17: name: "Update the value of the base image (ARG BOOKWORM_TAG) in the Dockerfile" kind: dockerfile sourceid: bookwormLatestVersion spec: - file: 11/debian/bookworm-slim/hotspot/Dockerfile + file: 17/debian/bookworm/hotspot/Dockerfile instruction: keyword: "ARG" matcher: "BOOKWORM_TAG" @@ -125,6 +161,46 @@ targets: keyword: "ARG" matcher: "BOOKWORM_TAG" scmid: default + updateDockerfileJDK21: + name: "Update the value of the base image (ARG BOOKWORM_TAG) in the Dockerfile" + kind: dockerfile + sourceid: bookwormLatestVersion + spec: + file: 21/debian/bookworm/hotspot/Dockerfile + instruction: + keyword: "ARG" + matcher: "BOOKWORM_TAG" + scmid: default + updateDockerfileJDK21Slim: + name: "Update the value of the base image (ARG BOOKWORM_TAG) in the Dockerfile" + kind: dockerfile + sourceid: bookwormLatestVersion + spec: + file: 21/debian/bookworm-slim/hotspot/Dockerfile + instruction: + keyword: "ARG" + matcher: "BOOKWORM_TAG" + scmid: default + updateDockerfileJDK21Preview: + name: "Update the value of the base image (ARG BOOKWORM_TAG) in the Dockerfile" + kind: dockerfile + sourceid: bookwormLatestVersion + spec: + file: 21/debian/bookworm/hotspot/preview/Dockerfile + instruction: + keyword: "ARG" + matcher: "BOOKWORM_TAG" + scmid: default + updateDockerfileJDK21SlimPreview: + name: "Update the value of the base image (ARG BOOKWORM_TAG) in the Dockerfile" + kind: dockerfile + sourceid: bookwormLatestVersion + spec: + file: 21/debian/bookworm-slim/hotspot/preview/Dockerfile + instruction: + keyword: "ARG" + matcher: "BOOKWORM_TAG" + scmid: default updateDockerBake: name: "Update the value of the base image (ARG BOOKWORM_TAG) in the docker-bake.hcl" kind: file @@ -144,3 +220,4 @@ actions: spec: labels: - dependencies + - debian