From 67e20ec76589516b8411d22d2b4f23201c51538d Mon Sep 17 00:00:00 2001 From: Jean-Francois Denise Date: Tue, 27 Aug 2024 10:30:46 +0200 Subject: [PATCH] Switch images to ubi9. Bump version to 2.x --- .github/workflows/main.yml | 6 +++--- wildfly-builder-image/image.yaml | 8 ++++++-- wildfly-builder-image/jdk11-overrides.yaml | 2 +- wildfly-builder-image/jdk17-overrides.yaml | 2 +- wildfly-builder-image/jdk21-overrides.yaml | 4 ++-- wildfly-runtime-image/image.yaml | 8 +++++--- wildfly-runtime-image/jdk11-overrides.yaml | 2 +- wildfly-runtime-image/jdk17-overrides.yaml | 2 +- wildfly-runtime-image/jdk21-overrides.yaml | 2 +- 9 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1748eacf..4ffc466b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -44,10 +44,10 @@ jobs: ls -l chmod +x ./skopeo ./skopeo --version - - name: Verify latest ubi8-minimal + - name: Verify latest ubi9-minimal run: | - podman pull registry.access.redhat.com/ubi8/ubi-minimal - podman image ls | grep ubi8 + podman pull registry.access.redhat.com/ubi9/ubi-minimal + podman image ls | grep ubi9 - name: Install qemu dependency run: | sudo apt-get update diff --git a/wildfly-builder-image/image.yaml b/wildfly-builder-image/image.yaml index fc3cda17..92047a58 100644 --- a/wildfly-builder-image/image.yaml +++ b/wildfly-builder-image/image.yaml @@ -1,7 +1,7 @@ schema_version: 1 name: &imgName "wildfly/wildfly-s2i" -from: "registry.access.redhat.com/ubi8/ubi-minimal" +from: "registry.access.redhat.com/ubi9/ubi-minimal" version: "unknown" labels: - name: name @@ -43,7 +43,7 @@ modules: - name: openjdk git: url: https://github.com/jboss-container-images/openjdk - ref: ubi8 + ref: ubi9 - name: wildfly-cekit-modules git: url: https://github.com/wildfly/wildfly-cekit-modules @@ -51,11 +51,15 @@ modules: - name: wildfly-modules path: ../wildfly-modules install: + - name: jboss.container.user + version: "2.0+jboss1" - name: jboss.container.util.pkg-update - name: jboss.container.openjdk.jdk - name: jboss.container.maven - name: jboss.container.wildfly.dynamic-resources - name: jboss.container.maven.s2i + - name: jboss.container.wildfly.run + version: "2.0" # Remove this dependency to not support env variable based provisioning and legacy workflow # Put it prior to wildfly.s2i-wildfly module in case this last module overrides env variables. - name: jboss.container.wildfly.s2i.legacy diff --git a/wildfly-builder-image/jdk11-overrides.yaml b/wildfly-builder-image/jdk11-overrides.yaml index b0fc9705..2eb5d153 100644 --- a/wildfly-builder-image/jdk11-overrides.yaml +++ b/wildfly-builder-image/jdk11-overrides.yaml @@ -1,7 +1,7 @@ schema_version: 1 description: "The WildFly s2i builder image, JDK 11" -version: &imgVersion "1.1.6-jdk11-snapshot" +version: &imgVersion "2.0.0-jdk11-snapshot" labels: - name: io.k8s.display-name value: "WildFly s2i builder image, JDK 11" diff --git a/wildfly-builder-image/jdk17-overrides.yaml b/wildfly-builder-image/jdk17-overrides.yaml index 1ab16b35..8f09777f 100644 --- a/wildfly-builder-image/jdk17-overrides.yaml +++ b/wildfly-builder-image/jdk17-overrides.yaml @@ -1,7 +1,7 @@ schema_version: 1 description: "The WildFly s2i builder image, JDK 17" -version: &imgVersion "1.1.6-jdk17-snapshot" +version: &imgVersion "2.0.0-jdk17-snapshot" labels: - name: io.k8s.display-name value: "WildFly s2i builder image, JDK 17" diff --git a/wildfly-builder-image/jdk21-overrides.yaml b/wildfly-builder-image/jdk21-overrides.yaml index b30561eb..eafe5321 100644 --- a/wildfly-builder-image/jdk21-overrides.yaml +++ b/wildfly-builder-image/jdk21-overrides.yaml @@ -1,7 +1,7 @@ schema_version: 1 description: "The WildFly s2i builder image, JDK 21" -version: &imgVersion "1.1.6-jdk21-snapshot" +version: &imgVersion "2.0.0-jdk21-snapshot" labels: - name: io.k8s.display-name value: "WildFly s2i builder image, JDK 21" @@ -15,4 +15,4 @@ modules: - name: jboss.container.openjdk.jdk version: "21" - name: jboss.container.maven - version: "3.8.17" + version: "3.8.21" diff --git a/wildfly-runtime-image/image.yaml b/wildfly-runtime-image/image.yaml index 8cffde8a..9069cd9a 100644 --- a/wildfly-runtime-image/image.yaml +++ b/wildfly-runtime-image/image.yaml @@ -1,7 +1,7 @@ schema_version: 1 name: &imgName "wildfly/wildfly-runtime" -from: "registry.access.redhat.com/ubi8/ubi-minimal" +from: "registry.access.redhat.com/ubi9/ubi-minimal" version: "unknown" labels: - name: name @@ -31,7 +31,7 @@ modules: - name: openjdk git: url: https://github.com/jboss-container-images/openjdk - ref: ubi8 + ref: ubi9 - name: wildfly-cekit-modules git: url: https://github.com/wildfly/wildfly-cekit-modules @@ -39,11 +39,13 @@ modules: - name: wildfly-modules path: ../wildfly-modules install: + - name: jboss.container.user + version: "2.0+jboss1" - name: jboss.container.util.pkg-update - name: jboss.container.openjdk.jdk - - name: jboss.container.java.jvm.bash - name: jboss.container.wildfly.dynamic-resources - name: jboss.container.wildfly.run + version: "2.0" - name: jboss.container.wildfly.cleanup packages: diff --git a/wildfly-runtime-image/jdk11-overrides.yaml b/wildfly-runtime-image/jdk11-overrides.yaml index 3b581910..0db94fa3 100644 --- a/wildfly-runtime-image/jdk11-overrides.yaml +++ b/wildfly-runtime-image/jdk11-overrides.yaml @@ -1,7 +1,7 @@ schema_version: 1 description: "The WildFly runtime image, JDK 11" -version: &imgVersion "1.1.6-jdk11-snapshot" +version: &imgVersion "2.0.0-jdk11-snapshot" labels: - name: "org.jboss.product.version" value: *imgVersion diff --git a/wildfly-runtime-image/jdk17-overrides.yaml b/wildfly-runtime-image/jdk17-overrides.yaml index d526ef01..21091a70 100644 --- a/wildfly-runtime-image/jdk17-overrides.yaml +++ b/wildfly-runtime-image/jdk17-overrides.yaml @@ -1,7 +1,7 @@ schema_version: 1 description: "The WildFly runtime image, JDK 17" -version: &imgVersion "1.1.6-jdk17-snapshot" +version: &imgVersion "2.0.0-jdk17-snapshot" labels: - name: "org.jboss.product.version" value: *imgVersion diff --git a/wildfly-runtime-image/jdk21-overrides.yaml b/wildfly-runtime-image/jdk21-overrides.yaml index 695db645..8d57d0b5 100644 --- a/wildfly-runtime-image/jdk21-overrides.yaml +++ b/wildfly-runtime-image/jdk21-overrides.yaml @@ -1,7 +1,7 @@ schema_version: 1 description: "The WildFly runtime image, JDK 21" -version: &imgVersion "1.1.6-jdk21-snapshot" +version: &imgVersion "2.0.0-jdk21-snapshot" labels: - name: "org.jboss.product.version" value: *imgVersion