From 00d847094932805e4c0d60f5f58e4fcdb4c48242 Mon Sep 17 00:00:00 2001 From: JF Denise Date: Tue, 13 Oct 2020 16:17:10 +0200 Subject: [PATCH 1/2] New 21 imagestreams --- imagestreams/wildfly-centos7.json | 20 ++++++++++++++++++++ imagestreams/wildfly-runtime-centos7.json | 19 +++++++++++++++++++ templates/wildfly-builder-imagestream.yml | 6 +++--- templates/wildfly-runtime-imagestream.yml | 6 +++--- 4 files changed, 45 insertions(+), 6 deletions(-) diff --git a/imagestreams/wildfly-centos7.json b/imagestreams/wildfly-centos7.json index 9805de82..38195767 100644 --- a/imagestreams/wildfly-centos7.json +++ b/imagestreams/wildfly-centos7.json @@ -307,6 +307,26 @@ "type": "Local" }, "name": "20.0" + }, + { + "annotations": { + "description": "Build and run WildFly 21 applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/wildfly/wildfly-s2i/blob/current/README.md.", + "iconClass": "icon-wildfly", + "openshift.io/display-name": "WildFly 21", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/openshift/openshift-jee-sample.git", + "supports": "wildfly:21,jee,java", + "tags": "builder,wildfly,java", + "version": "21.0" + }, + "from": { + "kind": "DockerImage", + "name": "quay.io/wildfly/wildfly-centos7:21.0" + }, + "referencePolicy": { + "type": "Local" + }, + "name": "21.0" } ] } diff --git a/imagestreams/wildfly-runtime-centos7.json b/imagestreams/wildfly-runtime-centos7.json index eee59b89..d5e6a2da 100644 --- a/imagestreams/wildfly-runtime-centos7.json +++ b/imagestreams/wildfly-runtime-centos7.json @@ -102,6 +102,25 @@ "type": "Local" }, "name": "20.0" + }, + { + "annotations": { + "description": "WildFly 21 runtime dependencies image based on CentOS 7. For more information about using this image, including OpenShift considerations, see https://github.com/wildfly/wildfly-s2i/blob/current/README.md.", + "iconClass": "icon-wildfly", + "openshift.io/display-name": "WildFly Runtime Dependencies 21", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "supports": "wildfly:21,jee,java", + "tags": "wildfly,java", + "version": "21.0" + }, + "from": { + "kind": "DockerImage", + "name": "quay.io/wildfly/wildfly-runtime-centos7:21.0" + }, + "referencePolicy": { + "type": "Local" + }, + "name": "21.0" } ] } diff --git a/templates/wildfly-builder-imagestream.yml b/templates/wildfly-builder-imagestream.yml index 7359cdea..fdf8f7e9 100644 --- a/templates/wildfly-builder-imagestream.yml +++ b/templates/wildfly-builder-imagestream.yml @@ -17,13 +17,13 @@ spec: from: kind: DockerImage name: "quay.io/wildfly/wildfly-centos7:latest" - - name: "20.0" + - name: "21.0" annotations: description: wildfly-builder image stream iconClass: icon-wildfly tags: builder,java,widlfly,galleon sampleRepo: https://github.com/openshift/openshift-jee-sample.git - version: '20.0' + version: '21.0' from: kind: DockerImage - name: "quay.io/wildfly/wildfly-centos7:20.0" \ No newline at end of file + name: "quay.io/wildfly/wildfly-centos7:21.0" \ No newline at end of file diff --git a/templates/wildfly-runtime-imagestream.yml b/templates/wildfly-runtime-imagestream.yml index b464b6c9..b57b939a 100644 --- a/templates/wildfly-runtime-imagestream.yml +++ b/templates/wildfly-runtime-imagestream.yml @@ -14,12 +14,12 @@ spec: from: kind: DockerImage name: "quay.io/wildfly/wildfly-runtime-centos7:latest" - - name: "20.0" + - name: "21.0" annotations: description: wildfly-runtime image stream iconClass: icon-wildfly tags: java,widlfly - version: '20.0' + version: '21.0' from: kind: DockerImage - name: "quay.io/wildfly/wildfly-runtime-centos7:20.0" \ No newline at end of file + name: "quay.io/wildfly/wildfly-runtime-centos7:21.0" \ No newline at end of file From 332be101a35d0704c4a8dac9bc2858d33000e438 Mon Sep 17 00:00:00 2001 From: JF Denise Date: Tue, 13 Oct 2020 16:27:35 +0200 Subject: [PATCH 2/2] Images 21.0 --- Makefile | 2 +- wildfly-builder-image/image.yaml | 6 +++--- wildfly-runtime-image/image.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index e321f1bd..d438fa55 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -IMAGE_VERSION=dev +IMAGE_VERSION=21.0 NAMESPACE=wildfly PLATFORM=centos7 IMAGE_NAME=${NAMESPACE}/wildfly-${PLATFORM} diff --git a/wildfly-builder-image/image.yaml b/wildfly-builder-image/image.yaml index 06717cf6..1e8128bc 100644 --- a/wildfly-builder-image/image.yaml +++ b/wildfly-builder-image/image.yaml @@ -2,7 +2,7 @@ schema_version: 1 name: &imgName "wildfly/wildfly-centos7" description: "The WildFly s2i image" -version: &imgVersion "dev" +version: &imgVersion "21.0" from: "centos/s2i-base-centos7" labels: - name: io.k8s.description @@ -12,7 +12,7 @@ labels: - name: io.openshift.expose-services value: "8080:http,8778:jolokia" - name: io.openshift.tags - value: "builder,wildfly,wildfly20" + value: "builder,wildfly,wildfly21" - name: maintainer value: "Jean-François Denise " envs: @@ -34,7 +34,7 @@ modules: - name: wildfly-cekit-modules git: url: https://github.com/wildfly/wildfly-cekit-modules - ref: master + ref: 0.21.0 - name: wildfly-s2i-modules path: ../wildfly-modules install: diff --git a/wildfly-runtime-image/image.yaml b/wildfly-runtime-image/image.yaml index 7466dd17..2eed1154 100644 --- a/wildfly-runtime-image/image.yaml +++ b/wildfly-runtime-image/image.yaml @@ -2,13 +2,13 @@ schema_version: 1 name: &imgName "wildfly/wildfly-runtime-centos7" description: "The WildFly runtime image" -version: &imgVersion "dev" +version: &imgVersion "21.0" from: "centos:7" labels: - name: io.openshift.expose-services value: "8080:http,8778:jolokia" - name: io.openshift.tags - value: "wildfly,wildfly20" + value: "wildfly,wildfly21" - name: maintainer value: "Jean-François Denise " envs: