Merge pull request #484 from jfdenise/main

2.0.0 images, based on ubi9
wildfly · Sep 10, 2024 · 8e41c31 · 8e41c31
2 parents 1ce71d4 + a728ade
commit 8e41c31
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/wildfly-builder-image/image.yaml b/wildfly-builder-image/image.yaml
@@ -47,7 +47,7 @@ modules:
           - name: wildfly-cekit-modules
             git:
               url: https://github.com/wildfly/wildfly-cekit-modules
-              ref: main
+              ref: 0.33.0
           - name: wildfly-modules
             path: ../wildfly-modules
       install:

diff --git 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 "2.0.0-jdk11-snapshot"
+version: &imgVersion "2.0.0-jdk11"
 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
@@ -1,7 +1,7 @@
 schema_version: 1
 
 description: "The WildFly s2i builder image, JDK 17"
-version: &imgVersion "2.0.0-jdk17-snapshot"
+version: &imgVersion "2.0.0-jdk17"
 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
@@ -1,7 +1,7 @@
 schema_version: 1
 
 description: "The WildFly s2i builder image, JDK 21"
-version: &imgVersion "2.0.0-jdk21-snapshot"
+version: &imgVersion "2.0.0-jdk21"
 labels:
     - name: io.k8s.display-name
       value: "WildFly s2i builder image, JDK 21"

diff --git a/wildfly-runtime-image/image.yaml b/wildfly-runtime-image/image.yaml
@@ -31,11 +31,11 @@ modules:
           - name: openjdk
             git:
               url: https://github.com/jboss-container-images/openjdk
-              ref: ubi9
+              ref: ubi9-wildfly-container-33.0
           - name: wildfly-cekit-modules
             git:
               url: https://github.com/wildfly/wildfly-cekit-modules
-              ref: main
+              ref: 0.33.0
           - name: wildfly-modules
             path: ../wildfly-modules
       install:

diff --git 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 "2.0.0-jdk11-snapshot"
+version: &imgVersion "2.0.0-jdk11"
 labels:
   - name: "org.jboss.product.version"
     value: *imgVersion

diff --git 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 "2.0.0-jdk17-snapshot"
+version: &imgVersion "2.0.0-jdk17"
 labels:
   - name: "org.jboss.product.version"
     value: *imgVersion

diff --git 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 "2.0.0-jdk21-snapshot"
+version: &imgVersion "2.0.0-jdk21"
 labels:
   - name: "org.jboss.product.version"
     value: *imgVersion