From 735d89fadfa20fec2bf4b55dbee597c0ac94f2c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= Date: Wed, 19 Jun 2024 18:35:58 +0200 Subject: [PATCH 1/2] hotfix(updatecli): remove docker compose target from manifests --- updatecli/updatecli.d/jdk11.yaml | 12 ------------ updatecli/updatecli.d/jdk17.yaml | 12 ------------ updatecli/updatecli.d/jdk21.yaml | 12 ------------ 3 files changed, 36 deletions(-) diff --git a/updatecli/updatecli.d/jdk11.yaml b/updatecli/updatecli.d/jdk11.yaml index 7bd22995..30b6ecd5 100644 --- a/updatecli/updatecli.d/jdk11.yaml +++ b/updatecli/updatecli.d/jdk11.yaml @@ -72,18 +72,6 @@ targets: file: docker-bake.hcl path: variable.JAVA11_VERSION.default scmid: default - setJDK11VersionDockerCompose: - name: "Bump JDK11 version for Windows images in the build-windows.yaml file" - kind: yaml - sourceid: jdk11LastVersion - spec: - file: build-windows.yaml - key: $.services.jdk11.build.args.JAVA_VERSION - transformers: - - replacer: - from: _ - to: + - scmid: default actions: default: diff --git a/updatecli/updatecli.d/jdk17.yaml b/updatecli/updatecli.d/jdk17.yaml index 56fbd394..94a7768b 100644 --- a/updatecli/updatecli.d/jdk17.yaml +++ b/updatecli/updatecli.d/jdk17.yaml @@ -72,18 +72,6 @@ targets: file: docker-bake.hcl path: variable.JAVA17_VERSION.default scmid: default - setJDK17VersionDockerCompose: - name: "Bump JDK17 version for Windows images in the build-windows.yaml file" - kind: yaml - sourceid: jdk17LastVersion - spec: - file: build-windows.yaml - key: $.services.jdk17.build.args.JAVA_VERSION - transformers: - - replacer: - from: _ - to: + - scmid: default setJDK17VersionAlpine: name: "Bump JDK17 default ARG version on Alpine Dockerfile" kind: dockerfile diff --git a/updatecli/updatecli.d/jdk21.yaml b/updatecli/updatecli.d/jdk21.yaml index 79cc9cfb..70becbff 100644 --- a/updatecli/updatecli.d/jdk21.yaml +++ b/updatecli/updatecli.d/jdk21.yaml @@ -77,18 +77,6 @@ targets: file: docker-bake.hcl path: variable.JAVA21_VERSION.default scmid: default - setJDK21VersionDockerCompose: - name: "Bump JDK21 version for Windows images in the build-windows.yaml file" - kind: yaml - sourceid: jdk21LastVersion - spec: - file: build-windows.yaml - key: $.services.jdk21.build.args.JAVA_VERSION - transformers: - - replacer: - from: _ - to: + - scmid: default actions: default: From 43c62e4732aee31a81feea3e29331198c057c390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= Date: Wed, 19 Jun 2024 18:56:04 +0200 Subject: [PATCH 2/2] add a missing # to a section comment in docker-bake.hcl --- docker-bake.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index 10ea68fe..43fd7f21 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -102,7 +102,7 @@ function "javaversion" { : "${JAVA21_VERSION}")) } -# Specific functions +## Specific functions # Return an array of Alpine platforms to use depending on the jdk passed as parameter function "alpine_platforms" { params = [jdk]