From 2a40e021d8eab5657e8fef9dcffc082ddf36811e Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Sat, 13 May 2023 15:14:17 -0600 Subject: [PATCH 1/2] Use Alma Linux 9.2, not 8.7 Most recent Alma Linux release, longer support life and more likely to include important fixes. Also incremented the default version of Jenkins that this script packages so that it matches with the next long term support baseline, 2.401. --- .github/CODEOWNERS | 2 +- .github/dependabot.yml | 2 +- 11/almalinux/{almalinux8 => almalinux9}/hotspot/Dockerfile | 6 +++--- docker-bake.hcl | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename 11/almalinux/{almalinux8 => almalinux9}/hotspot/Dockerfile (96%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 0d0ff4a5fd..cc3be282ed 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,3 +1,3 @@ * @jenkinsci/team-docker-packaging */rhel/ubi*/ @olivergondza -*/almalinux/almalinux8/ @saper +*/almalinux/almalinux9/ @saper diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 5b6c6c225b..d01445f00f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -31,7 +31,7 @@ updates: # AlmaLinux - package-ecosystem: docker - directory: "11/almalinux/almalinux8/hotspot" + directory: "11/almalinux/almalinux9/hotspot" schedule: interval: weekly open-pull-requests-limit: 2 diff --git a/11/almalinux/almalinux8/hotspot/Dockerfile b/11/almalinux/almalinux9/hotspot/Dockerfile similarity index 96% rename from 11/almalinux/almalinux8/hotspot/Dockerfile rename to 11/almalinux/almalinux9/hotspot/Dockerfile index 8cd59f7d17..69a1b50af3 100644 --- a/11/almalinux/almalinux8/hotspot/Dockerfile +++ b/11/almalinux/almalinux9/hotspot/Dockerfile @@ -9,7 +9,7 @@ RUN jlink \ --compress=2 \ --output /javaruntime -FROM almalinux:8.7 +FROM almalinux:9.2-20230512 ENV LANG C.UTF-8 @@ -66,10 +66,10 @@ RUN curl -fsSL "https://github.com/krallin/tini/releases/download/${TINI_VERSION # jenkins version being bundled in this docker image ARG JENKINS_VERSION -ENV JENKINS_VERSION ${JENKINS_VERSION:-2.356} +ENV JENKINS_VERSION ${JENKINS_VERSION:-2.401} # jenkins.war checksum, download will be validated using it -ARG JENKINS_SHA=1163c4554dc93439c5eef02b06a8d74f98ca920bbc012c2b8a089d414cfa8075 +ARG JENKINS_SHA=9f80ea9080c036a4bb7bd0d70a8863e13bdeea04bf7d6320d509bdcf888172b1 # Can be used to customize where jenkins.war get downloaded from ARG JENKINS_URL=https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-war/${JENKINS_VERSION}/jenkins-war-${JENKINS_VERSION}.war diff --git a/docker-bake.hcl b/docker-bake.hcl index 7b2431b4c4..154812fbb7 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -94,7 +94,7 @@ function "tag_lts" { # ---- targets ---- target "almalinux_jdk11" { - dockerfile = "11/almalinux/almalinux8/hotspot/Dockerfile" + dockerfile = "11/almalinux/almalinux9/hotspot/Dockerfile" context = "." args = { JENKINS_VERSION = JENKINS_VERSION From f291eded59493f124d399db8547db24d75682e00 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Tue, 16 May 2023 20:27:46 -0600 Subject: [PATCH 2/2] Use JDK build for UBI9 --- 11/almalinux/almalinux9/hotspot/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/11/almalinux/almalinux9/hotspot/Dockerfile b/11/almalinux/almalinux9/hotspot/Dockerfile index 69a1b50af3..da1686bf6d 100644 --- a/11/almalinux/almalinux9/hotspot/Dockerfile +++ b/11/almalinux/almalinux9/hotspot/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:11.0.19_7-jdk-centos7 as jre-build +FROM eclipse-temurin:11.0.19_7-jdk-ubi9-minimal as jre-build # Generate smaller java runtime without unneeded files # for now we include the full module path to maintain compatibility