Skip to content

Commit

Permalink
JDK21 WildFly images
Browse files Browse the repository at this point in the history
  • Loading branch information
jfdenise committed Nov 21, 2023
1 parent 1e24a60 commit 19530e1
Show file tree
Hide file tree
Showing 9 changed files with 72 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/v2-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
* `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`
8 changes: 6 additions & 2 deletions docs/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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

Expand Down
12 changes: 9 additions & 3 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,10 @@ <h2 id="_wildfly_ubi8_runtime_image">WildFly - UBI8 runtime image</h2>
<p>JDK17 based runtime image: <code>docker pull quay.io/wildfly/wildfly-runtime:latest-jdk17</code></p>
</li>
<li>
<p>Latest LTS JDK based runtime image: <code>docker pull quay.io/wildfly/wildfly-runtime:latest</code></p>
<p>JDK21 based runtime image: <code>docker pull quay.io/wildfly/wildfly-runtime:latest-jdk21</code></p>
</li>
<li>
<p>Latest LTS JDK (with which we have completed the full set of testing of WildFly) based runtime image: <code>docker pull quay.io/wildfly/wildfly-runtime:latest</code></p>
</li>
</ul>
</div>
Expand Down Expand Up @@ -499,7 +502,10 @@ <h3 id="_s2i_builder_images">S2I builder images</h3>
<p>JDK17 based builder image: <code>docker pull quay.io/wildfly/wildfly-s2i:latest-jdk17</code></p>
</li>
<li>
<p>Latest LTS JDK based: <code>docker pull quay.io/wildfly/wildfly-s2i:latest</code></p>
<p>JDK21 based builder image: <code>docker pull quay.io/wildfly/wildfly-s2i:latest-jdk21</code></p>
</li>
<li>
<p>Latest LTS JDK (with which we have completed the full set of testing of WildFly) based builder image: <code>docker pull quay.io/wildfly/wildfly-s2i:latest</code></p>
</li>
</ul>
</div>
Expand Down Expand Up @@ -629,7 +635,7 @@ <h2 id="_using_image_streams_with_helm_chart_for_wildfly">Using image streams wi
</div>
<div id="footer">
<div id="footer-text">
Last updated 2023-10-24 17:21:19 +0200
Last updated 2023-11-21 10:05:21 +0100
</div>
</div>
</body>
Expand Down
16 changes: 16 additions & 0 deletions imagestreams/wildfly-s2i.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

18 changes: 18 additions & 0 deletions wildfly-builder-image/jdk21-overrides.yaml
Original file line number Diff line number Diff line change
@@ -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"
14 changes: 14 additions & 0 deletions wildfly-runtime-image/jdk21-overrides.yaml
Original file line number Diff line number Diff line change
@@ -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"

0 comments on commit 19530e1

Please sign in to comment.