From f6e294e0b9ac05f15f6b8937227b16fcd18ba12b Mon Sep 17 00:00:00 2001 From: gounthar Date: Mon, 18 Sep 2023 10:13:43 +0200 Subject: [PATCH 01/15] chore(dependencies): Updatecli manifests for HDJ 11,17 and 21. --- updatecli/scripts/check-jdk.sh | 73 ++++++++++++++ updatecli/updatecli.d/jdk11.yaml | 161 +++++++++++++++++++++++++++++++ updatecli/updatecli.d/jdk17.yaml | 143 +++++++++++++++++++++++++++ updatecli/updatecli.d/jdk21.yaml | 60 ++++++++++++ 4 files changed, 437 insertions(+) create mode 100644 updatecli/scripts/check-jdk.sh create mode 100644 updatecli/updatecli.d/jdk11.yaml create mode 100644 updatecli/updatecli.d/jdk17.yaml create mode 100644 updatecli/updatecli.d/jdk21.yaml diff --git a/updatecli/scripts/check-jdk.sh b/updatecli/scripts/check-jdk.sh new file mode 100644 index 0000000000..003f49178c --- /dev/null +++ b/updatecli/scripts/check-jdk.sh @@ -0,0 +1,73 @@ +#!/bin/bash +# This script checks that the provided JDK version has all the required binaries available for downloads +# as sometimes, the tag for adoptium is published immeidatly while binaries are published later. +## +# The source of truth is the ERB template stored at the location dist/profile/templates/jenkinscontroller/casc/tools.yaml.erb +# It lists all the installations used as "Jenkins Tools" by the Jenkins controllers of the infrastructure +## +set -eu -o pipefail + +command -v curl >/dev/null 2>&1 || { echo "ERROR: curl command not found. Exiting."; exit 1; } + +function get_jdk_download_url() { + jdk_version="${1}" + platform="${2}" + case "${jdk_version}" in + 8*) + ## JDK8 does not have the carret ('-') in their archive names + echo "https://github.com/adoptium/temurin8-binaries/releases/download/jdk${jdk_version}/OpenJDK8U-jdk_${platform}_hotspot_${jdk_version//-}"; + return 0;; + 11*) + ## JDK11 URLs have an underscore ('_') instead of a plus ('+') in their archive names + echo "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-${jdk_version}/OpenJDK11U-jdk_${platform}_hotspot_${jdk_version//+/_}"; + return 0;; + 17*) + ## JDK17 URLs have an underscore ('_') instead of a plus ('+') in their archive names + echo "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-${jdk_version}/OpenJDK17U-jdk_${platform}_hotspot_${jdk_version//+/_}"; + return 0;; + 19*) + ## JDK19 URLs have an underscore ('_') instead of a plus ('+') in their archive names + echo "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-${jdk_version}/OpenJDK19U-jdk_${platform}_hotspot_${jdk_version//+/_}"; + return 0;; + 21*) + # JDK version (21+35-ea-beta) + ## https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21%2B35-ea-beta/OpenJDK21U-jdk_aarch64_linux_hotspot_ea_21-0-35.tar.gz + urlEncodedJDKVersion="${jdk_version//+/%2B}" + echo "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-${urlEncodedJDKVersion}-ea-beta/OpenJDK21U-jdk_${platform}_hotspot_ea_21-0-$(echo ${jdk_version} | cut -d '+' -f 2 | cut -d '-' -f 1)" + return 0;; + *) + echo "ERROR: unsupported JDK version (${jdk_version})."; + exit 1;; + esac +} + +case "${1}" in + 8u*) + # No s390x support for JDK8: $platforms is kept as default + platforms=("x64_linux" "x64_windows" "aarch64_linux");; + 11.*) + platforms=("x64_linux" "x64_windows" "aarch64_linux" "s390x_linux");; + 17.*+*) + platforms=("x64_linux" "x64_windows" "aarch64_linux" "s390x_linux");; + 19.*+*) + platforms=("x64_linux" "x64_windows" "aarch64_linux" "s390x_linux");; + 21*+*) + platforms=("x64_linux" "x64_windows" "aarch64_linux" "s390x_linux");; + *) + echo "ERROR: unsupported JDK version (${1})."; + exit 1;; +esac + +for platform in "${platforms[@]}" +do + url_to_check="$(get_jdk_download_url "${1}" "${platform}")" + if [[ "${platform}" == *windows* ]] + then + url_to_check+=".zip" + else + url_to_check+=".tar.gz" + fi + >&2 curl --connect-timeout 5 --location --head --fail --silent "${url_to_check}" || { echo "ERROR: the following URL is NOT available: ${url_to_check}."; exit 1; } +done + +echo "OK: all JDK URL for version=${1} are available." diff --git a/updatecli/updatecli.d/jdk11.yaml b/updatecli/updatecli.d/jdk11.yaml new file mode 100644 index 0000000000..754704a9cb --- /dev/null +++ b/updatecli/updatecli.d/jdk11.yaml @@ -0,0 +1,161 @@ +--- +name: Bump JDK11 version + +scms: + default: + kind: github + spec: + user: "{{ .github.user }}" + email: "{{ .github.email }}" + owner: "{{ .github.owner }}" + repository: "{{ .github.repository }}" + token: "{{ requiredEnv .github.token }}" + username: "{{ .github.username }}" + branch: "{{ .github.branch }}" + +sources: + lastVersion: + kind: githubrelease + name: Get the latest Adoptium JDK11 version + spec: + owner: "adoptium" + repository: "temurin11-binaries" + token: "{{ requiredEnv .github.token }}" + username: "{{ .github.username }}" + versionfilter: + kind: regex + # jdk-11.0.12+7(https://github.com/adoptium/temurin11-binaries/releases/tag/jdk-11.0.12%2B7) is OK + # jdk-11.0.16.1+1 (https://github.com/adoptium/temurin11-binaries/releases/tag/jdk-11.0.16.1%2B1) is OK + pattern: "^jdk-11.(\\d*).(\\d*).(\\d*)(.(\\d*))+(\\d*)$" + transformers: + - trimprefix: "jdk-" + - replacer: + from: + + to: _ + +conditions: + checkTemurinAlpineDockerImage: + kind: dockerimage + name: Check if the container image "eclipse-temurin:-jdk-alpine" is available + disablesourceinput: true + spec: + architecture: amd64 + image: eclipse-temurin + tag: '{{source "lastVersion" }}-jdk-alpine' + checkTemurinDebianDockerImages: + kind: dockerimage + name: Check if the container image "eclipse-temurin:-jdk-focal" is available + disablesourceinput: true + spec: + architectures: + - amd64 + - arm64 + - s390x + - arm/v7 + image: eclipse-temurin + tag: '{{source "lastVersion" }}-jdk-focal' + checkTemurinNanoserver2019DockerImage: + kind: dockerimage + name: Check if the container image "eclipse-temurin:-jdk-nanoserver-1809" is available + disablesourceinput: true + spec: + architecture: amd64 + image: eclipse-temurin + tag: '{{source "lastVersion" }}-jdk-nanoserver-1809' + checkTemurinWindowsCore2019DockerImage: + kind: dockerimage + name: Check if the container image "eclipse-temurin:-jdk-windowsservercore-1809" is available + disablesourceinput: true + spec: + architecture: amd64 + image: eclipse-temurin + tag: '{{source "lastVersion" }}-jdk-windowsservercore-1809' + checkTemurinNanoserver2022DockerImage: + kind: dockerimage + name: Check if the container image "eclipse-temurin:-jdk-nanoserver-ltsc2022" is available + disablesourceinput: true + spec: + architecture: amd64 + image: eclipse-temurin + tag: '{{source "lastVersion" }}-jdk-nanoserver-ltsc2022' + checkTemurinWindowsCore2022DockerImage: + kind: dockerimage + name: Check if the container image "eclipse-temurin:-jdk-windowsservercore-18ltsc202209" is available + disablesourceinput: true + spec: + architecture: amd64 + image: eclipse-temurin + tag: '{{source "lastVersion" }}-jdk-windowsservercore-ltsc2022' + +targets: + setJDK11VersionDockerBake: + name: "Bump JDK11 version for Linux images in the docker-bake.hcl file" + kind: hcl + spec: + file: docker-bake.hcl + path: variable.JAVA11_VERSION.default + scmid: default + setJDK11VersionAlmaLinux8: + name: "Bump JDK11 version for Linux images for Alma Linux 8 Dockerfile" + kind: dockerfile + spec: + file: 11/almalinux/almalinux8/hotspot/Dockerfile + instruction: + keyword: ARG + matcher: JAVA_VERSION + scmid: default + setJDK11VersionAlpine: + name: "Bump JDK11 version for Linux images for Alpine Linux Dockerfile" + kind: dockerfile + spec: + file: 11/alpine/hotspot/Dockerfile + instruction: + keyword: ARG + matcher: JAVA_VERSION + scmid: default + setJDK11VersionDebian: + name: "Bump JDK11 version for Linux images for Debian Dockerfile" + kind: dockerfile + spec: + file: 11/debian/bookworm/hotspot/Dockerfile + instruction: + keyword: ARG + matcher: JAVA_VERSION + scmid: default + setJDK11VersionDebianSlim: + name: "Bump JDK11 version for Linux images for Debian Slim Dockerfile" + kind: dockerfile + spec: + file: 11/debian/bookworm-slim/hotspot/Dockerfile + instruction: + keyword: ARG + matcher: JAVA_VERSION + scmid: default + setJDK11VersionRhel: + name: "Bump JDK11 version for Linux images for Rhel Dockerfile" + kind: dockerfile + spec: + file: 11/rhel/ubi8/hotspot/Dockerfile + instruction: + keyword: ARG + matcher: JAVA_VERSION + scmid: default + setJDK11VersionWindows: + name: "Bump JDK11 version for Linux images for Windows Dockerfile" + kind: dockerfile + spec: + file: 11/windows/windowsservercore-2019/hotspot/Dockerfile + instruction: + keyword: ARG + matcher: JAVA_VERSION + scmid: default + +actions: + default: + kind: github/pullrequest + scmid: default + title: Bump JDK11 version to {{ source "lastVersion" }} + spec: + labels: + - dependencies + - jdk11 diff --git a/updatecli/updatecli.d/jdk17.yaml b/updatecli/updatecli.d/jdk17.yaml new file mode 100644 index 0000000000..bde7cf60e9 --- /dev/null +++ b/updatecli/updatecli.d/jdk17.yaml @@ -0,0 +1,143 @@ +--- +name: Bump JDK17 version + +scms: + default: + kind: github + spec: + user: "{{ .github.user }}" + email: "{{ .github.email }}" + owner: "{{ .github.owner }}" + repository: "{{ .github.repository }}" + token: "{{ requiredEnv .github.token }}" + username: "{{ .github.username }}" + branch: "{{ .github.branch }}" + +sources: + lastVersion: + kind: githubrelease + name: Get the latest Adoptium JDK17 version + spec: + owner: "adoptium" + repository: "temurin17-binaries" + token: "{{ requiredEnv .github.token }}" + username: "{{ .github.username }}" + versionfilter: + kind: regex + # jdk-17.0.12+7(https://github.com/adoptium/temurin17-binaries/releases/tag/jdk-17.0.12%2B7) is OK + # jdk-17.0.16.1+1 (https://github.com/adoptium/temurin17-binaries/releases/tag/jdk-17.0.16.1%2B1) is OK + pattern: "^jdk-17.(\\d*).(\\d*).(\\d*)(.(\\d*))+(\\d*)$" + transformers: + - trimprefix: "jdk-" + - replacer: + from: + + to: _ + +conditions: + checkTemurinAlpineDockerImage: + kind: dockerimage + name: Check if the container image "eclipse-temurin:-jdk-alpine" is available + disablesourceinput: true + spec: + architecture: amd64 + image: eclipse-temurin + tag: '{{source "lastVersion" }}-jdk-alpine' + checkTemurinDebianDockerImages: + kind: dockerimage + name: Check if the container image "eclipse-temurin:-jdk-focal" is available + disablesourceinput: true + spec: + architectures: + - amd64 + - arm64 + - s390x + - arm/v7 + image: eclipse-temurin + tag: '{{source "lastVersion" }}-jdk-focal' + checkTemurinNanoserver2019DockerImage: + kind: dockerimage + name: Check if the container image "eclipse-temurin:-jdk-nanoserver-1809" is available + disablesourceinput: true + spec: + architecture: amd64 + image: eclipse-temurin + tag: '{{source "lastVersion" }}-jdk-nanoserver-1809' + checkTemurinWindowsCore2019DockerImage: + kind: dockerimage + name: Check if the container image "eclipse-temurin:-jdk-windowsservercore-1809" is available + disablesourceinput: true + spec: + architecture: amd64 + image: eclipse-temurin + tag: '{{source "lastVersion" }}-jdk-windowsservercore-1809' + checkTemurinNanoserver2022DockerImage: + kind: dockerimage + name: Check if the container image "eclipse-temurin:-jdk-nanoserver-ltsc2022" is available + disablesourceinput: true + spec: + architecture: amd64 + image: eclipse-temurin + tag: '{{source "lastVersion" }}-jdk-nanoserver-ltsc2022' + checkTemurinWindowsCore2022DockerImage: + kind: dockerimage + name: Check if the container image "eclipse-temurin:-jdk-windowsservercore-18ltsc202209" is available + disablesourceinput: true + spec: + architecture: amd64 + image: eclipse-temurin + tag: '{{source "lastVersion" }}-jdk-windowsservercore-ltsc2022' + +targets: + setJDK17VersionDockerBake: + name: "Bump JDK17 version for Linux images in the docker-bake.hcl file" + kind: hcl + spec: + file: docker-bake.hcl + path: variable.JAVA17_VERSION.default + scmid: default + setJDK17VersionAlpine: + name: "Bump JDK17 version for Linux images for Alpine Linux Dockerfile" + kind: dockerfile + spec: + file: 17/alpine/hotspot/Dockerfile + instruction: + keyword: ARG + matcher: JAVA_VERSION + scmid: default + setJDK17VersionDebian: + name: "Bump JDK17 version for Linux images for Debian Dockerfile" + kind: dockerfile + spec: + file: 17/debian/bookworm/hotspot/Dockerfile + instruction: + keyword: ARG + matcher: JAVA_VERSION + scmid: default + setJDK17VersionDebianSlim: + name: "Bump JDK17 version for Linux images for Debian Slim Dockerfile" + kind: dockerfile + spec: + file: 17/debian/bookworm-slim/hotspot/Dockerfile + instruction: + keyword: ARG + matcher: JAVA_VERSION + scmid: default + setJDK17VersionRhel: + name: "Bump JDK17 version for Linux images for Rhel Dockerfile" + kind: dockerfile + spec: + file: 17/rhel/ubi9/hotspot/Dockerfile + instruction: + keyword: ARG + matcher: JAVA_VERSION + scmid: default + +actions: + default: + kind: github/pullrequest + scmid: default + title: Bump JDK17 version to {{ source "lastVersion" }} + spec: + labels: + - dependencies + - jdk17 diff --git a/updatecli/updatecli.d/jdk21.yaml b/updatecli/updatecli.d/jdk21.yaml new file mode 100644 index 0000000000..43928b7a90 --- /dev/null +++ b/updatecli/updatecli.d/jdk21.yaml @@ -0,0 +1,60 @@ +--- +name: Bump JDK21 version for all Linux images + +scms: + default: + kind: github + spec: + user: "{{ .github.user }}" + email: "{{ .github.email }}" + owner: "{{ .github.owner }}" + repository: "{{ .github.repository }}" + token: "{{ requiredEnv .github.token }}" + username: "{{ .github.username }}" + branch: "{{ .github.branch }}" + temurin21-binaries: + kind: "github" + spec: + user: "{{ .github.user }}" + email: "{{ .github.email }}" + owner: "adoptium" + repository: "temurin21-binaries" + token: '{{ requiredEnv .github.token }}' + branch: "main" + +sources: + getLatestJDK21EAVersion: + name: Get the latest Adoptium JDK21 version + kind: gittag + scmid: temurin21-binaries + spec: + versionfilter: + kind: regex + pattern: ".*-ea-.*" + transformers: + - trimprefix: "jdk-" + - trimsuffix: "-ea-beta" + +conditions: + checkIfReleaseIsAvailable: + kind: shell + spec: + command: bash ./updatecli/scripts/check-jdk.sh # source input value passed as argument + +targets: + setJDK21Version: + name: "Bump JDK21 version for Linux images in the docker-bake.hcl file" + kind: hcl + spec: + file: docker-bake.hcl + path: variable.JAVA21_VERSION.default + scmid: default + +actions: + default: + kind: github/pullrequest + scmid: default + title: Bump JDK21 version to {{ source "getLatestJDK21EAVersion" }} + spec: + labels: + - dependencies From 4339981154f4f1ee428aae3c3f586e2d49e42326 Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Mon, 18 Sep 2023 19:43:57 +0200 Subject: [PATCH 02/15] Merge remote-tracking branch 'upstream/master' into updatecli-for-java-manifests --- .github/workflows/sync-plugin-manager.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/sync-plugin-manager.yml b/.github/workflows/sync-plugin-manager.yml index c596ad2e15..7c535ccefd 100644 --- a/.github/workflows/sync-plugin-manager.yml +++ b/.github/workflows/sync-plugin-manager.yml @@ -15,7 +15,7 @@ jobs: - name: PLUGIN_CLI_VERSION id: lts - run: | + run: | NEXT_VERSION=$(curl -sL https://api.github.com/repos/jenkinsci/plugin-installation-manager-tool/releases/latest | jq -r ".tag_name") if [ -z "$NEXT_VERSION" ] || [ $NEXT_VERSION = "null" ]; then echo "ERROR: Empty or 'null' latest plugin-installation-manager-tool version returned by GitHub API." @@ -38,19 +38,19 @@ jobs: if: ${{ steps.update.outputs.available == 'true' }} run: | grep -ilr ${{ steps.update.outputs.current-version }} ./ | grep -v CHANGELOG.md | xargs sed -i 's/${{ steps.update.outputs.current-version }}/${{ steps.lts.outputs.next-version }}/g' - + - name: Changelog if: ${{ steps.update.outputs.available == 'true' }} run: | sed -i '/git commit to be able to get more details./a \\n## ${{ steps.nextversion.outputs.version }}\n\nUpdate Jenkins plugin cli verions to jenkins plugin cli lts release version ${{ steps.lts.outputs.next-version }}\n' CHANGELOG.md - + - name: Git Diff if: ${{ steps.update.outputs.available == 'true' }} run: | git diff # update the changelog - - - uses: tibdex/github-app-token@v1 + + - uses: tibdex/github-app-token@v2 id: generate-token with: app_id: ${{ secrets.JENKINS_DEPENDENCY_UPDATER_APP_ID }} @@ -58,7 +58,7 @@ jobs: - name: Create Pull Request id: cpr - uses: peter-evans/create-pull-request@v3 + uses: peter-evans/create-pull-request@v5 if: ${{ steps.update.outputs.available == 'true' }} with: token: ${{ steps.generate-token.outputs.token }} @@ -66,4 +66,4 @@ jobs: author: jenkins-dependency-updater <81680575+jenkins-dependency-updater[bot]@users.noreply.github.com> committer: jenkins-dependency-updater <81680575+jenkins-dependency-updater[bot]@users.noreply.github.com> signoff: true - title: 'chore(deps): bump plugin manager to ${{ steps.lts.outputs.next-version }}' + title: 'chore(deps): bump plugin manager to ${{ steps.lts.outputs.next-version }}' \ No newline at end of file From ac5cec93814973517b11cd8622fffb8081e0551d Mon Sep 17 00:00:00 2001 From: gounthar Date: Tue, 19 Sep 2023 10:04:49 +0200 Subject: [PATCH 03/15] fix(updatecli): Works with updatecli 0.61.0. --- updatecli/updatecli.d/jdk11.yaml | 34 +++++++++++++++++--------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/updatecli/updatecli.d/jdk11.yaml b/updatecli/updatecli.d/jdk11.yaml index 754704a9cb..7e64bce227 100644 --- a/updatecli/updatecli.d/jdk11.yaml +++ b/updatecli/updatecli.d/jdk11.yaml @@ -24,8 +24,6 @@ sources: username: "{{ .github.username }}" versionfilter: kind: regex - # jdk-11.0.12+7(https://github.com/adoptium/temurin11-binaries/releases/tag/jdk-11.0.12%2B7) is OK - # jdk-11.0.16.1+1 (https://github.com/adoptium/temurin11-binaries/releases/tag/jdk-11.0.16.1%2B1) is OK pattern: "^jdk-11.(\\d*).(\\d*).(\\d*)(.(\\d*))+(\\d*)$" transformers: - trimprefix: "jdk-" @@ -44,22 +42,22 @@ conditions: tag: '{{source "lastVersion" }}-jdk-alpine' checkTemurinDebianDockerImages: kind: dockerimage - name: Check if the container image "eclipse-temurin:-jdk-focal" is available + name: Check if the container image "eclipse-temurin:-jdk-jammy" is available disablesourceinput: true spec: architectures: - - amd64 - - arm64 - - s390x - - arm/v7 + - amd64 + - arm64 + - s390x + - linux/arm/v7 image: eclipse-temurin - tag: '{{source "lastVersion" }}-jdk-focal' + tag: '{{source "lastVersion" }}-jdk-jammy' checkTemurinNanoserver2019DockerImage: kind: dockerimage name: Check if the container image "eclipse-temurin:-jdk-nanoserver-1809" is available disablesourceinput: true spec: - architecture: amd64 + # architecture: amd64 image: eclipse-temurin tag: '{{source "lastVersion" }}-jdk-nanoserver-1809' checkTemurinWindowsCore2019DockerImage: @@ -67,7 +65,7 @@ conditions: name: Check if the container image "eclipse-temurin:-jdk-windowsservercore-1809" is available disablesourceinput: true spec: - architecture: amd64 + # architecture: amd64 image: eclipse-temurin tag: '{{source "lastVersion" }}-jdk-windowsservercore-1809' checkTemurinNanoserver2022DockerImage: @@ -75,7 +73,7 @@ conditions: name: Check if the container image "eclipse-temurin:-jdk-nanoserver-ltsc2022" is available disablesourceinput: true spec: - architecture: amd64 + # architecture: amd64 image: eclipse-temurin tag: '{{source "lastVersion" }}-jdk-nanoserver-ltsc2022' checkTemurinWindowsCore2022DockerImage: @@ -83,7 +81,7 @@ conditions: name: Check if the container image "eclipse-temurin:-jdk-windowsservercore-18ltsc202209" is available disablesourceinput: true spec: - architecture: amd64 + # architecture: amd64 image: eclipse-temurin tag: '{{source "lastVersion" }}-jdk-windowsservercore-ltsc2022' @@ -110,8 +108,10 @@ targets: spec: file: 11/alpine/hotspot/Dockerfile instruction: - keyword: ARG - matcher: JAVA_VERSION + keyword: "FROM" + matcher: "eclipse-temurin" + transformers: + - addsuffix: "-jdk-alpine" scmid: default setJDK11VersionDebian: name: "Bump JDK11 version for Linux images for Debian Dockerfile" @@ -146,8 +146,10 @@ targets: spec: file: 11/windows/windowsservercore-2019/hotspot/Dockerfile instruction: - keyword: ARG - matcher: JAVA_VERSION + keyword: "FROM" + matcher: "eclipse-temurin" + transformers: + - addsuffix: "-jdk-windowsservercore-1809" scmid: default actions: From 9fc9a30ffb690a3be727cff4feba859740cd8c00 Mon Sep 17 00:00:00 2001 From: gounthar Date: Tue, 19 Sep 2023 10:19:35 +0200 Subject: [PATCH 04/15] fix(updatecli): Works with updatecli 0.61.0. --- updatecli/updatecli.d/jdk17.yaml | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/updatecli/updatecli.d/jdk17.yaml b/updatecli/updatecli.d/jdk17.yaml index bde7cf60e9..5a347233ff 100644 --- a/updatecli/updatecli.d/jdk17.yaml +++ b/updatecli/updatecli.d/jdk17.yaml @@ -39,7 +39,6 @@ conditions: name: Check if the container image "eclipse-temurin:-jdk-alpine" is available disablesourceinput: true spec: - architecture: amd64 image: eclipse-temurin tag: '{{source "lastVersion" }}-jdk-alpine' checkTemurinDebianDockerImages: @@ -51,7 +50,7 @@ conditions: - amd64 - arm64 - s390x - - arm/v7 + - linux/arm/v7 image: eclipse-temurin tag: '{{source "lastVersion" }}-jdk-focal' checkTemurinNanoserver2019DockerImage: @@ -59,7 +58,6 @@ conditions: name: Check if the container image "eclipse-temurin:-jdk-nanoserver-1809" is available disablesourceinput: true spec: - architecture: amd64 image: eclipse-temurin tag: '{{source "lastVersion" }}-jdk-nanoserver-1809' checkTemurinWindowsCore2019DockerImage: @@ -67,7 +65,6 @@ conditions: name: Check if the container image "eclipse-temurin:-jdk-windowsservercore-1809" is available disablesourceinput: true spec: - architecture: amd64 image: eclipse-temurin tag: '{{source "lastVersion" }}-jdk-windowsservercore-1809' checkTemurinNanoserver2022DockerImage: @@ -75,7 +72,6 @@ conditions: name: Check if the container image "eclipse-temurin:-jdk-nanoserver-ltsc2022" is available disablesourceinput: true spec: - architecture: amd64 image: eclipse-temurin tag: '{{source "lastVersion" }}-jdk-nanoserver-ltsc2022' checkTemurinWindowsCore2022DockerImage: @@ -83,7 +79,6 @@ conditions: name: Check if the container image "eclipse-temurin:-jdk-windowsservercore-18ltsc202209" is available disablesourceinput: true spec: - architecture: amd64 image: eclipse-temurin tag: '{{source "lastVersion" }}-jdk-windowsservercore-ltsc2022' @@ -101,8 +96,10 @@ targets: spec: file: 17/alpine/hotspot/Dockerfile instruction: - keyword: ARG - matcher: JAVA_VERSION + keyword: "FROM" + matcher: "eclipse-temurin" + transformers: + - addsuffix: "-jdk-alpine" scmid: default setJDK17VersionDebian: name: "Bump JDK17 version for Linux images for Debian Dockerfile" @@ -110,8 +107,10 @@ targets: spec: file: 17/debian/bookworm/hotspot/Dockerfile instruction: - keyword: ARG - matcher: JAVA_VERSION + keyword: "FROM" + matcher: "eclipse-temurin" + transformers: + - addsuffix: "-jdk-jammy" scmid: default setJDK17VersionDebianSlim: name: "Bump JDK17 version for Linux images for Debian Slim Dockerfile" @@ -119,8 +118,10 @@ targets: spec: file: 17/debian/bookworm-slim/hotspot/Dockerfile instruction: - keyword: ARG - matcher: JAVA_VERSION + keyword: "FROM" + matcher: "eclipse-temurin" + transformers: + - addsuffix: "-jdk-jammy" scmid: default setJDK17VersionRhel: name: "Bump JDK17 version for Linux images for Rhel Dockerfile" @@ -128,8 +129,10 @@ targets: spec: file: 17/rhel/ubi9/hotspot/Dockerfile instruction: - keyword: ARG - matcher: JAVA_VERSION + keyword: "FROM" + matcher: "eclipse-temurin" + transformers: + - addsuffix: "-jdk-ubi9-minimal" scmid: default actions: From 48596f7024476d5bc89e467fb2e722f9254b1b4b Mon Sep 17 00:00:00 2001 From: gounthar Date: Tue, 19 Sep 2023 10:37:03 +0200 Subject: [PATCH 05/15] fix(updatecli): Works with updatecli 0.61.0. --- updatecli/updatecli.d/jdk21.yaml | 35 ++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/updatecli/updatecli.d/jdk21.yaml b/updatecli/updatecli.d/jdk21.yaml index 43928b7a90..d5fe5e53ec 100644 --- a/updatecli/updatecli.d/jdk21.yaml +++ b/updatecli/updatecli.d/jdk21.yaml @@ -42,14 +42,45 @@ conditions: command: bash ./updatecli/scripts/check-jdk.sh # source input value passed as argument targets: - setJDK21Version: + setJDK21VersionDockerBake: name: "Bump JDK21 version for Linux images in the docker-bake.hcl file" kind: hcl spec: file: docker-bake.hcl path: variable.JAVA21_VERSION.default scmid: default - + setJDK21VersionAlpine: + name: "Bump JDK21 version for Linux images in the Alpine Linux Dockerfile" + kind: dockerfile + spec: + file: 21/alpine/hotspot/Dockerfile + instruction: + keyword: "ARG" + matcher: "JAVA_VERSION" + setJDK21VersionDebian: + name: "Bump JDK21 version for Linux images in the Debian Dockerfile" + kind: dockerfile + spec: + file: 21/debian/bookworm/hotspot/Dockerfile + instruction: + keyword: "ARG" + matcher: "JAVA_VERSION" + setJDK21VersionDebianSlim: + name: "Bump JDK21 version for Linux images in the Debian Slim Dockerfile" + kind: dockerfile + spec: + file: 21/debian/bookworm-slim/hotspot/Dockerfile + instruction: + keyword: "ARG" + matcher: "JAVA_VERSION" + setJDK21VersionRhel: + name: "Bump JDK21 version for Linux images in the Rhel Dockerfile" + kind: dockerfile + spec: + file: 21/rhel/ubi9/hotspot/Dockerfile + instruction: + keyword: "ARG" + matcher: "JAVA_VERSION" actions: default: kind: github/pullrequest From 851b4ed09752cd32fab483649cf9fe14e62e52c7 Mon Sep 17 00:00:00 2001 From: gounthar Date: Tue, 19 Sep 2023 10:38:08 +0200 Subject: [PATCH 06/15] fix(updatecli): Misprint. --- updatecli/updatecli.d/jdk11.yaml | 12 ++++++------ updatecli/updatecli.d/jdk17.yaml | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/updatecli/updatecli.d/jdk11.yaml b/updatecli/updatecli.d/jdk11.yaml index 7e64bce227..2f39639995 100644 --- a/updatecli/updatecli.d/jdk11.yaml +++ b/updatecli/updatecli.d/jdk11.yaml @@ -94,7 +94,7 @@ targets: path: variable.JAVA11_VERSION.default scmid: default setJDK11VersionAlmaLinux8: - name: "Bump JDK11 version for Linux images for Alma Linux 8 Dockerfile" + name: "Bump JDK11 version for Linux images in the Alma Linux 8 Dockerfile" kind: dockerfile spec: file: 11/almalinux/almalinux8/hotspot/Dockerfile @@ -103,7 +103,7 @@ targets: matcher: JAVA_VERSION scmid: default setJDK11VersionAlpine: - name: "Bump JDK11 version for Linux images for Alpine Linux Dockerfile" + name: "Bump JDK11 version for Linux images in the Alpine Linux Dockerfile" kind: dockerfile spec: file: 11/alpine/hotspot/Dockerfile @@ -114,7 +114,7 @@ targets: - addsuffix: "-jdk-alpine" scmid: default setJDK11VersionDebian: - name: "Bump JDK11 version for Linux images for Debian Dockerfile" + name: "Bump JDK11 version for Linux images in the Debian Dockerfile" kind: dockerfile spec: file: 11/debian/bookworm/hotspot/Dockerfile @@ -123,7 +123,7 @@ targets: matcher: JAVA_VERSION scmid: default setJDK11VersionDebianSlim: - name: "Bump JDK11 version for Linux images for Debian Slim Dockerfile" + name: "Bump JDK11 version for Linux images in the Debian Slim Dockerfile" kind: dockerfile spec: file: 11/debian/bookworm-slim/hotspot/Dockerfile @@ -132,7 +132,7 @@ targets: matcher: JAVA_VERSION scmid: default setJDK11VersionRhel: - name: "Bump JDK11 version for Linux images for Rhel Dockerfile" + name: "Bump JDK11 version for Linux images in the Rhel Dockerfile" kind: dockerfile spec: file: 11/rhel/ubi8/hotspot/Dockerfile @@ -141,7 +141,7 @@ targets: matcher: JAVA_VERSION scmid: default setJDK11VersionWindows: - name: "Bump JDK11 version for Linux images for Windows Dockerfile" + name: "Bump JDK11 version for Linux images in the Windows Dockerfile" kind: dockerfile spec: file: 11/windows/windowsservercore-2019/hotspot/Dockerfile diff --git a/updatecli/updatecli.d/jdk17.yaml b/updatecli/updatecli.d/jdk17.yaml index 5a347233ff..2057bfcaf4 100644 --- a/updatecli/updatecli.d/jdk17.yaml +++ b/updatecli/updatecli.d/jdk17.yaml @@ -91,7 +91,7 @@ targets: path: variable.JAVA17_VERSION.default scmid: default setJDK17VersionAlpine: - name: "Bump JDK17 version for Linux images for Alpine Linux Dockerfile" + name: "Bump JDK17 version for Linux images in the Alpine Linux Dockerfile" kind: dockerfile spec: file: 17/alpine/hotspot/Dockerfile @@ -102,7 +102,7 @@ targets: - addsuffix: "-jdk-alpine" scmid: default setJDK17VersionDebian: - name: "Bump JDK17 version for Linux images for Debian Dockerfile" + name: "Bump JDK17 version for Linux images in the Debian Dockerfile" kind: dockerfile spec: file: 17/debian/bookworm/hotspot/Dockerfile @@ -113,7 +113,7 @@ targets: - addsuffix: "-jdk-jammy" scmid: default setJDK17VersionDebianSlim: - name: "Bump JDK17 version for Linux images for Debian Slim Dockerfile" + name: "Bump JDK17 version for Linux images in the Debian Slim Dockerfile" kind: dockerfile spec: file: 17/debian/bookworm-slim/hotspot/Dockerfile @@ -124,7 +124,7 @@ targets: - addsuffix: "-jdk-jammy" scmid: default setJDK17VersionRhel: - name: "Bump JDK17 version for Linux images for Rhel Dockerfile" + name: "Bump JDK17 version for Linux images in the Rhel Dockerfile" kind: dockerfile spec: file: 17/rhel/ubi9/hotspot/Dockerfile From e27476f5eecb0ae88a15bc6267c7fcfde645b9f3 Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Tue, 19 Sep 2023 16:28:42 +0200 Subject: [PATCH 07/15] Update .github/workflows/sync-plugin-manager.yml Co-authored-by: Damien Duportal --- .github/workflows/sync-plugin-manager.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-plugin-manager.yml b/.github/workflows/sync-plugin-manager.yml index 7c535ccefd..f25ce5521d 100644 --- a/.github/workflows/sync-plugin-manager.yml +++ b/.github/workflows/sync-plugin-manager.yml @@ -66,4 +66,4 @@ jobs: author: jenkins-dependency-updater <81680575+jenkins-dependency-updater[bot]@users.noreply.github.com> committer: jenkins-dependency-updater <81680575+jenkins-dependency-updater[bot]@users.noreply.github.com> signoff: true - title: 'chore(deps): bump plugin manager to ${{ steps.lts.outputs.next-version }}' \ No newline at end of file + title: 'chore(deps): bump plugin manager to ${{ steps.lts.outputs.next-version }}' From 5bf7295704c76fd6a9af59f5aa2207635911c444 Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Tue, 19 Sep 2023 16:30:14 +0200 Subject: [PATCH 08/15] fix(indentation): After Damien's review. --- .github/workflows/sync-plugin-manager.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/sync-plugin-manager.yml b/.github/workflows/sync-plugin-manager.yml index f25ce5521d..a4aab7338d 100644 --- a/.github/workflows/sync-plugin-manager.yml +++ b/.github/workflows/sync-plugin-manager.yml @@ -15,7 +15,7 @@ jobs: - name: PLUGIN_CLI_VERSION id: lts - run: | + run: | NEXT_VERSION=$(curl -sL https://api.github.com/repos/jenkinsci/plugin-installation-manager-tool/releases/latest | jq -r ".tag_name") if [ -z "$NEXT_VERSION" ] || [ $NEXT_VERSION = "null" ]; then echo "ERROR: Empty or 'null' latest plugin-installation-manager-tool version returned by GitHub API." @@ -38,18 +38,18 @@ jobs: if: ${{ steps.update.outputs.available == 'true' }} run: | grep -ilr ${{ steps.update.outputs.current-version }} ./ | grep -v CHANGELOG.md | xargs sed -i 's/${{ steps.update.outputs.current-version }}/${{ steps.lts.outputs.next-version }}/g' - + - name: Changelog if: ${{ steps.update.outputs.available == 'true' }} run: | sed -i '/git commit to be able to get more details./a \\n## ${{ steps.nextversion.outputs.version }}\n\nUpdate Jenkins plugin cli verions to jenkins plugin cli lts release version ${{ steps.lts.outputs.next-version }}\n' CHANGELOG.md - + - name: Git Diff if: ${{ steps.update.outputs.available == 'true' }} run: | git diff # update the changelog - + - uses: tibdex/github-app-token@v2 id: generate-token with: From f1130aa7a3b7a794455a5997de26cbfa4d1bb067 Mon Sep 17 00:00:00 2001 From: gounthar Date: Wed, 20 Sep 2023 17:04:25 +0200 Subject: [PATCH 09/15] fix(docker): Clean up --- docker-bake.hcl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index 58340325f9..69f68108e3 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -244,8 +244,8 @@ target "debian_jdk11" { JENKINS_SHA = JENKINS_SHA COMMIT_SHA = COMMIT_SHA PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION - JAVA_VERSION = JAVA11_VERSION BOOKWORM_TAG = BOOKWORM_TAG + JAVA_VERSION = JAVA11_VERSION } tags = [ tag(true, ""), @@ -269,8 +269,8 @@ target "debian_jdk17" { JENKINS_SHA = JENKINS_SHA COMMIT_SHA = COMMIT_SHA PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION - JAVA_VERSION = JAVA17_VERSION BOOKWORM_TAG = BOOKWORM_TAG + JAVA_VERSION = JAVA17_VERSION } tags = [ tag(true, "jdk17"), @@ -290,8 +290,8 @@ target "debian_jdk21" { JENKINS_SHA = JENKINS_SHA COMMIT_SHA = COMMIT_SHA PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION - JAVA_VERSION = JAVA21_VERSION BOOKWORM_TAG = BOOKWORM_TAG + JAVA_VERSION = JAVA21_VERSION } tags = [ tag(true, "jdk21"), @@ -311,8 +311,8 @@ target "debian_slim_jdk11" { JENKINS_SHA = JENKINS_SHA COMMIT_SHA = COMMIT_SHA PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION - JAVA_VERSION = JAVA11_VERSION BOOKWORM_TAG = BOOKWORM_TAG + JAVA_VERSION = JAVA11_VERSION } tags = [ tag(true, "slim"), @@ -333,8 +333,8 @@ target "debian_slim_jdk17" { JENKINS_SHA = JENKINS_SHA COMMIT_SHA = COMMIT_SHA PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION - JAVA_VERSION = JAVA17_VERSION BOOKWORM_TAG = BOOKWORM_TAG + JAVA_VERSION = JAVA17_VERSION } tags = [ tag(true, "slim-jdk17"), @@ -352,8 +352,8 @@ target "debian_slim_jdk21" { JENKINS_SHA = JENKINS_SHA COMMIT_SHA = COMMIT_SHA PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION - JAVA_VERSION = JAVA21_VERSION BOOKWORM_TAG = BOOKWORM_TAG + JAVA_VERSION = JAVA21_VERSION } tags = [ tag(true, "slim-jdk21-preview"), From 8fecf70b541419b4c3c2f6107cbb0c1cd2d8c516 Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Sat, 23 Sep 2023 19:55:58 +0200 Subject: [PATCH 10/15] fix(docker): No more static build number. --- 21/alpine/hotspot/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/21/alpine/hotspot/Dockerfile b/21/alpine/hotspot/Dockerfile index f1af527f10..4569cd9366 100644 --- a/21/alpine/hotspot/Dockerfile +++ b/21/alpine/hotspot/Dockerfile @@ -1,7 +1,6 @@ ARG ALPINE_TAG=3.18.3 FROM alpine:"${ALPINE_TAG}" AS jre-build -ARG BUILD_NUMBER=35 -ARG JAVA_VERSION=21+${BUILD_NUMBER} +ARG JAVA_VERSION=21+35 ARG TARGETPLATFORM # hadolint ignore=DL4006 From d349ed9eeab8975e0136ef39eca105bf42fba0f1 Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Sat, 23 Sep 2023 19:57:06 +0200 Subject: [PATCH 11/15] fix(docker): No more static build number. --- 21/debian/bookworm-slim/hotspot/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/21/debian/bookworm-slim/hotspot/Dockerfile b/21/debian/bookworm-slim/hotspot/Dockerfile index ead2cac2f6..f509bec809 100644 --- a/21/debian/bookworm-slim/hotspot/Dockerfile +++ b/21/debian/bookworm-slim/hotspot/Dockerfile @@ -1,7 +1,6 @@ ARG BOOKWORM_TAG=20230904 FROM debian:bookworm-"${BOOKWORM_TAG}"-slim as jre-build -ARG BUILD_NUMBER=35 -ARG JAVA_VERSION=21+${BUILD_NUMBER} +ARG JAVA_VERSION=21+35 ARG TARGETPLATFORM SHELL ["/bin/bash", "-o", "pipefail", "-c"] From da4b2f6758645940013bc925b18bfe144b66b2ee Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Sat, 23 Sep 2023 19:57:52 +0200 Subject: [PATCH 12/15] fix(docker): No more static build number. --- 21/debian/bookworm/hotspot/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/21/debian/bookworm/hotspot/Dockerfile b/21/debian/bookworm/hotspot/Dockerfile index 214c6f9b42..3117328072 100644 --- a/21/debian/bookworm/hotspot/Dockerfile +++ b/21/debian/bookworm/hotspot/Dockerfile @@ -1,7 +1,6 @@ ARG BOOKWORM_TAG=20230904 FROM debian:bookworm-"${BOOKWORM_TAG}"-slim as jre-build -ARG BUILD_NUMBER=35 -ARG JAVA_VERSION=21+${BUILD_NUMBER} +ARG JAVA_VERSION=21+35 ARG TARGETPLATFORM SHELL ["/bin/bash", "-o", "pipefail", "-c"] From 0dfccf142405441c0c803026a020ef88024bb7dd Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Sat, 23 Sep 2023 19:58:34 +0200 Subject: [PATCH 13/15] fix(docker): No more static build number. --- 21/rhel/ubi9/hotspot/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/21/rhel/ubi9/hotspot/Dockerfile b/21/rhel/ubi9/hotspot/Dockerfile index c60da734ff..1de355c8c5 100644 --- a/21/rhel/ubi9/hotspot/Dockerfile +++ b/21/rhel/ubi9/hotspot/Dockerfile @@ -1,6 +1,5 @@ FROM registry.access.redhat.com/ubi9/ubi:9.2-722 as jre-build -ARG BUILD_NUMBER=34 -ARG JAVA_VERSION=21+${BUILD_NUMBER} +ARG JAVA_VERSION=21+35 ARG TARGETPLATFORM SHELL ["/bin/bash", "-o", "pipefail", "-c"] From 8cd6f43cb5771b7efe9460cef42062cfe689d99e Mon Sep 17 00:00:00 2001 From: gounthar Date: Sun, 24 Sep 2023 18:57:09 +0200 Subject: [PATCH 14/15] fix(dependencies): Dependabot should ignore new Java versions. Updatecli takes care of it. --- .github/dependabot.yml | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 55f0c8d51b..9e3f649700 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -16,9 +16,8 @@ updates: labels: - dependencies ignore: - # Ignore proposals to update to new major versions of Java + # Ignore proposals to update to new versions of Java because updatecli takes care of that. - dependency-name: "eclipse-temurin" - update-types: ["version-update:semver-major"] - package-ecosystem: docker directory: "11/alpine/hotspot" @@ -32,9 +31,8 @@ updates: labels: - dependencies ignore: - # Ignore proposals to update to new major versions of Java + # Ignore proposals to update to new versions of Java because updatecli takes care of that. - dependency-name: "eclipse-temurin" - update-types: ["version-update:semver-major"] # AlmaLinux @@ -50,8 +48,8 @@ updates: labels: - dependencies ignore: + # Ignore proposals to update to new versions of Java because updatecli takes care of that. - dependency-name: "eclipse-temurin" - update-types: ["version-update:semver-major"] # Ignore proposals to update to Alma Linux 9 or later - dependency-name: "almalinux" update-types: ["version-update:semver-major"] @@ -69,9 +67,8 @@ updates: labels: - dependencies ignore: - # Ignore proposals to update to new major versions of Java + # Ignore proposals to update to new versions of Java because updatecli takes care of that. - dependency-name: "eclipse-temurin" - update-types: ["version-update:semver-major"] # Debian Linux @@ -87,9 +84,8 @@ updates: labels: - dependencies ignore: - # Ignore proposals to update to new major versions of Java + # Ignore proposals to update to new versions of Java because updatecli takes care of that. - dependency-name: "eclipse-temurin" - update-types: ["version-update:semver-major"] - package-ecosystem: docker directory: "17/debian/bookworm-slim/hotspot" @@ -103,9 +99,8 @@ updates: labels: - dependencies ignore: - # Ignore proposals to update to new major versions of Java + # Ignore proposals to update to new versions of Java because updatecli takes care of that. - dependency-name: "eclipse-temurin" - update-types: ["version-update:semver-major"] - package-ecosystem: docker directory: "11/debian/bookworm/hotspot" @@ -119,9 +114,8 @@ updates: labels: - dependencies ignore: - # Ignore proposals to update to new major versions of Java + # Ignore proposals to update to new versions of Java because updatecli takes care of that. - dependency-name: "eclipse-temurin" - update-types: ["version-update:semver-major"] - package-ecosystem: docker directory: "11/debian/bookworm-slim/hotspot" @@ -135,9 +129,8 @@ updates: labels: - dependencies ignore: - # Ignore proposals to update to new major versions of Java + # Ignore proposals to update to new versions of Java because updatecli takes care of that. - dependency-name: "eclipse-temurin" - update-types: ["version-update:semver-major"] # RHEL UBI @@ -153,9 +146,8 @@ updates: labels: - dependencies ignore: - # Ignore proposals to update to new major versions of Java + # Ignore proposals to update to new versions of Java because updatecli takes care of that. - dependency-name: "eclipse-temurin" - update-types: ["version-update:semver-major"] - package-ecosystem: docker directory: "17/rhel/ubi9/hotspot" @@ -169,9 +161,8 @@ updates: labels: - dependencies ignore: - # Ignore proposals to update to new major versions of Java + # Ignore proposals to update to new versions of Java because updatecli takes care of that. - dependency-name: "eclipse-temurin" - update-types: ["version-update:semver-major"] # Windows @@ -185,6 +176,9 @@ updates: - slide labels: - dependencies + ignore: + # Ignore proposals to update to new versions of Java because updatecli takes care of that. + - dependency-name: "eclipse-temurin" # GitHub actions From 82f063362d163eaeca434910e9c9854eeb1602ad Mon Sep 17 00:00:00 2001 From: gounthar Date: Mon, 25 Sep 2023 09:11:06 +0200 Subject: [PATCH 15/15] fix(dependencies): Use ARG instead of FROM --- updatecli/updatecli.d/jdk11.yaml | 12 ++++-------- updatecli/updatecli.d/jdk17.yaml | 24 ++++++++---------------- 2 files changed, 12 insertions(+), 24 deletions(-) diff --git a/updatecli/updatecli.d/jdk11.yaml b/updatecli/updatecli.d/jdk11.yaml index 2f39639995..8394615a8f 100644 --- a/updatecli/updatecli.d/jdk11.yaml +++ b/updatecli/updatecli.d/jdk11.yaml @@ -108,10 +108,8 @@ targets: spec: file: 11/alpine/hotspot/Dockerfile instruction: - keyword: "FROM" - matcher: "eclipse-temurin" - transformers: - - addsuffix: "-jdk-alpine" + keyword: ARG + matcher: JAVA_VERSION scmid: default setJDK11VersionDebian: name: "Bump JDK11 version for Linux images in the Debian Dockerfile" @@ -146,10 +144,8 @@ targets: spec: file: 11/windows/windowsservercore-2019/hotspot/Dockerfile instruction: - keyword: "FROM" - matcher: "eclipse-temurin" - transformers: - - addsuffix: "-jdk-windowsservercore-1809" + keyword: ARG + matcher: JAVA_VERSION scmid: default actions: diff --git a/updatecli/updatecli.d/jdk17.yaml b/updatecli/updatecli.d/jdk17.yaml index 2057bfcaf4..9a026d5d1d 100644 --- a/updatecli/updatecli.d/jdk17.yaml +++ b/updatecli/updatecli.d/jdk17.yaml @@ -96,10 +96,8 @@ targets: spec: file: 17/alpine/hotspot/Dockerfile instruction: - keyword: "FROM" - matcher: "eclipse-temurin" - transformers: - - addsuffix: "-jdk-alpine" + keyword: ARG + matcher: JAVA_VERSION scmid: default setJDK17VersionDebian: name: "Bump JDK17 version for Linux images in the Debian Dockerfile" @@ -107,10 +105,8 @@ targets: spec: file: 17/debian/bookworm/hotspot/Dockerfile instruction: - keyword: "FROM" - matcher: "eclipse-temurin" - transformers: - - addsuffix: "-jdk-jammy" + keyword: ARG + matcher: JAVA_VERSION scmid: default setJDK17VersionDebianSlim: name: "Bump JDK17 version for Linux images in the Debian Slim Dockerfile" @@ -118,10 +114,8 @@ targets: spec: file: 17/debian/bookworm-slim/hotspot/Dockerfile instruction: - keyword: "FROM" - matcher: "eclipse-temurin" - transformers: - - addsuffix: "-jdk-jammy" + keyword: ARG + matcher: JAVA_VERSION scmid: default setJDK17VersionRhel: name: "Bump JDK17 version for Linux images in the Rhel Dockerfile" @@ -129,10 +123,8 @@ targets: spec: file: 17/rhel/ubi9/hotspot/Dockerfile instruction: - keyword: "FROM" - matcher: "eclipse-temurin" - transformers: - - addsuffix: "-jdk-ubi9-minimal" + keyword: ARG + matcher: JAVA_VERSION scmid: default actions: