diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9d319e15..cdeac9f9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,7 +20,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
- jdk: [jdk11, jdk17]
+ jdk: [jdk11, jdk17, jdk21]
steps:
- name: Update hosts - linux
if: matrix.os == 'ubuntu-latest'
diff --git a/.github/workflows/v2-push.yml b/.github/workflows/v2-push.yml
index ecf73a3a..2c7b9d0e 100644
--- a/.github/workflows/v2-push.yml
+++ b/.github/workflows/v2-push.yml
@@ -21,7 +21,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
- jdk: [jdk11, jdk17]
+ jdk: [jdk11, jdk17, jdk21]
steps:
- id: files
if: ${{ github.event_name == 'push' }}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 90b64b89..c9a9bff9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -48,7 +48,7 @@ For example:
git remote add upstream https://github.com/wildfly/wildfly-s2i
```
-To build JDK 11 and JDK17 builder and runtime images look at this : [Readme](https://github.com/wildfly/wildfly-s2i/blob/main/README.md#building-the-images).
+To build JDK 11, JDK 17 and JDK 21 builder and runtime images look at this : [Readme](https://github.com/wildfly/wildfly-s2i/blob/main/README.md#building-the-images).
To run the behave tests:
diff --git a/README.md b/README.md
index 73a60b2a..15851124 100644
--- a/README.md
+++ b/README.md
@@ -23,4 +23,9 @@ You must have [cekit](https://github.com/cekit/cekit) installed.
## Building the JDK17 images
* `cd wildfly-builder-image; cekit build --overrides=jdk17-overrides.yaml docker`
-* `cd wildfly-runtime-image; cekit build --overrides=jdk17-overrides.yaml docker`
\ No newline at end of file
+* `cd wildfly-runtime-image; cekit build --overrides=jdk17-overrides.yaml docker`
+
+## Building the JDK21 images
+
+* `cd wildfly-builder-image; cekit build --overrides=jdk21-overrides.yaml docker`
+* `cd wildfly-runtime-image; cekit build --overrides=jdk21-overrides.yaml docker`
\ No newline at end of file
diff --git a/docs/index.adoc b/docs/index.adoc
index 5e29925a..6f61af20 100644
--- a/docs/index.adoc
+++ b/docs/index.adoc
@@ -8,7 +8,9 @@ An image containing all you need to run a WildFly Server. This image is to be us
* JDK17 based runtime image: `docker pull quay.io/wildfly/wildfly-runtime:latest-jdk17`
-* Latest LTS JDK based runtime image: `docker pull quay.io/wildfly/wildfly-runtime:latest`
+* JDK21 based runtime image: `docker pull quay.io/wildfly/wildfly-runtime:latest-jdk21`
+
+* Latest LTS JDK (with which we have completed the full set of testing of WildFly) based runtime image: `docker pull quay.io/wildfly/wildfly-runtime:latest`
The example link:https://github.com/wildfly/wildfly-s2i/blob/main/examples/docker-build[docker-build] covers building an image from your Maven application project.
@@ -36,7 +38,9 @@ Documentation of the WildFly Maven plugin can be found link:https://docs.wildfly
* JDK17 based builder image: `docker pull quay.io/wildfly/wildfly-s2i:latest-jdk17`
-* Latest LTS JDK based: `docker pull quay.io/wildfly/wildfly-s2i:latest`
+* JDK21 based builder image: `docker pull quay.io/wildfly/wildfly-s2i:latest-jdk21`
+
+* Latest LTS JDK (with which we have completed the full set of testing of WildFly) based builder image: `docker pull quay.io/wildfly/wildfly-s2i:latest`
=== Using the S2I builder image
diff --git a/docs/index.html b/docs/index.html
index f30cbbd6..bbe46f38 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -453,7 +453,10 @@ WildFly - UBI8 runtime image
JDK17 based runtime image: docker pull quay.io/wildfly/wildfly-runtime:latest-jdk17
-Latest LTS JDK based runtime image: docker pull quay.io/wildfly/wildfly-runtime:latest
+JDK21 based runtime image: docker pull quay.io/wildfly/wildfly-runtime:latest-jdk21
+
+
+Latest LTS JDK (with which we have completed the full set of testing of WildFly) based runtime image: docker pull quay.io/wildfly/wildfly-runtime:latest
@@ -499,7 +502,10 @@ S2I builder images
JDK17 based builder image: docker pull quay.io/wildfly/wildfly-s2i:latest-jdk17
-Latest LTS JDK based: docker pull quay.io/wildfly/wildfly-s2i:latest
+JDK21 based builder image: docker pull quay.io/wildfly/wildfly-s2i:latest-jdk21
+
+
+Latest LTS JDK (with which we have completed the full set of testing of WildFly) based builder image: docker pull quay.io/wildfly/wildfly-s2i:latest
@@ -629,7 +635,7 @@ Using image streams wi
diff --git a/imagestreams/wildfly-s2i.yaml b/imagestreams/wildfly-s2i.yaml
index fa997db0..d3dfb177 100644
--- a/imagestreams/wildfly-s2i.yaml
+++ b/imagestreams/wildfly-s2i.yaml
@@ -51,3 +51,19 @@ spec:
referencePolicy:
type: Local
name: latest-jdk17
+ - annotations:
+ description: Build and run WildFly applications on UBI 8 and JDK 21. For more
+ information about using this builder image, including OpenShift considerations,
+ see https://github.com/wildfly/wildfly-s2i/blob/main/README.md.
+ iconClass: icon-wildfly
+ openshift.io/display-name: WildFly S2I builder, JDK 21
+ openshift.io/provider-display-name: Red Hat, Inc.
+ supports: jee,java
+ tags: builder,wildfly,java
+ from:
+ kind: DockerImage
+ name: quay.io/wildfly/wildfly-s2i:latest-jdk21
+ referencePolicy:
+ type: Local
+ name: latest-jdk21
+
diff --git a/wildfly-builder-image/jdk21-overrides.yaml b/wildfly-builder-image/jdk21-overrides.yaml
new file mode 100644
index 00000000..430581db
--- /dev/null
+++ b/wildfly-builder-image/jdk21-overrides.yaml
@@ -0,0 +1,18 @@
+schema_version: 1
+
+description: "The WildFly s2i builder image, JDK 21"
+version: &imgVersion "1.1.4-jdk21-snapshot"
+labels:
+ - name: io.k8s.display-name
+ value: "WildFly s2i builder image, JDK 21"
+ - name: "org.jboss.product.version"
+ value: *imgVersion
+envs:
+ - name: IMAGE_VERSION
+ value: *imgVersion
+modules:
+ install:
+ - name: jboss.container.openjdk.jdk
+ version: "21"
+ - name: jboss.container.maven
+ version: "3.8.17"
diff --git a/wildfly-runtime-image/jdk21-overrides.yaml b/wildfly-runtime-image/jdk21-overrides.yaml
new file mode 100644
index 00000000..a4b96ee2
--- /dev/null
+++ b/wildfly-runtime-image/jdk21-overrides.yaml
@@ -0,0 +1,14 @@
+schema_version: 1
+
+description: "The WildFly runtime image, JDK 21"
+version: &imgVersion "1.1.4-jdk21-snapshot"
+labels:
+ - name: "org.jboss.product.version"
+ value: *imgVersion
+envs:
+ - name: IMAGE_VERSION
+ value: *imgVersion
+modules:
+ install:
+ - name: jboss.container.openjdk.jdk
+ version: "21"