From a728adea6670ff8d61e1b65301d59c5f94ed385d Mon Sep 17 00:00:00 2001
From: Jean-Francois Denise <jdenise@redhat.com>
Date: Tue, 10 Sep 2024 16:01:15 +0200
Subject: [PATCH] 2.0.0 images, based on ubi9

---
 wildfly-builder-image/image.yaml           | 2 +-
 wildfly-builder-image/jdk11-overrides.yaml | 2 +-
 wildfly-builder-image/jdk17-overrides.yaml | 2 +-
 wildfly-builder-image/jdk21-overrides.yaml | 2 +-
 wildfly-runtime-image/image.yaml           | 4 ++--
 wildfly-runtime-image/jdk11-overrides.yaml | 2 +-
 wildfly-runtime-image/jdk17-overrides.yaml | 2 +-
 wildfly-runtime-image/jdk21-overrides.yaml | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/wildfly-builder-image/image.yaml b/wildfly-builder-image/image.yaml
index 7cd64414..cfe0d0ce 100644
--- 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
index 2eb5d153..ffdb855f 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 "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
index 8f09777f..d11a769a 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 "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
index eafe5321..e9bae2ff 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 "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
index 30402b8c..775581ff 100644
--- 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
index 0db94fa3..26747f5a 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 "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
index 21091a70..7fefac9e 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 "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
index 8d57d0b5..722d3139 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 "2.0.0-jdk21-snapshot"
+version: &imgVersion "2.0.0-jdk21"
 labels:
   - name: "org.jboss.product.version"
     value: *imgVersion