From 1df7997d7cc6b00da211d83f843fb2f25e3a844a Mon Sep 17 00:00:00 2001 From: Sokratis Zappis Date: Tue, 9 Apr 2024 17:02:17 +0300 Subject: [PATCH] Updates for JWS 5.8.0 Signed-off-by: Sokratis Zappis --- ...7-openjdk11-tomcat9-ubi8-image-stream.json | 232 ------------------ ...7-openjdk17-tomcat9-ubi8-image-stream.json | 192 --------------- ...57-openjdk8-tomcat9-ubi8-image-stream.json | 232 ------------------ ...s58-openjdk11-tomcat9-ubi8-basic-s2i.json} | 14 +- ...s58-openjdk11-tomcat9-ubi8-https-s2i.json} | 14 +- ...8-openjdk11-tomcat9-ubi8-image-stream.json | 72 ++++++ ...s58-openjdk17-tomcat9-ubi8-basic-s2i.json} | 14 +- ...s58-openjdk17-tomcat9-ubi8-https-s2i.json} | 14 +- ...8-openjdk17-tomcat9-ubi8-image-stream.json | 72 ++++++ ...ws58-openjdk8-tomcat9-ubi8-basic-s2i.json} | 14 +- ...ws58-openjdk8-tomcat9-ubi8-https-s2i.json} | 14 +- ...58-openjdk8-tomcat9-ubi8-image-stream.json | 72 ++++++ tomcat9/image.yaml | 18 +- tomcat9/jdk11-overrides.yaml | 16 +- tomcat9/jdk17-overrides.yaml | 16 +- tomcat9/jdk8-overrides.yaml | 2 +- 16 files changed, 284 insertions(+), 724 deletions(-) delete mode 100644 templates/jws57-openjdk11-tomcat9-ubi8-image-stream.json delete mode 100644 templates/jws57-openjdk17-tomcat9-ubi8-image-stream.json delete mode 100644 templates/jws57-openjdk8-tomcat9-ubi8-image-stream.json rename templates/{jws57-openjdk11-tomcat9-ubi8-basic-s2i.json => jws58-openjdk11-tomcat9-ubi8-basic-s2i.json} (96%) rename templates/{jws57-openjdk11-tomcat9-ubi8-https-s2i.json => jws58-openjdk11-tomcat9-ubi8-https-s2i.json} (97%) create mode 100644 templates/jws58-openjdk11-tomcat9-ubi8-image-stream.json rename templates/{jws57-openjdk17-tomcat9-ubi8-basic-s2i.json => jws58-openjdk17-tomcat9-ubi8-basic-s2i.json} (96%) rename templates/{jws57-openjdk17-tomcat9-ubi8-https-s2i.json => jws58-openjdk17-tomcat9-ubi8-https-s2i.json} (97%) create mode 100644 templates/jws58-openjdk17-tomcat9-ubi8-image-stream.json rename templates/{jws57-openjdk8-tomcat9-ubi8-basic-s2i.json => jws58-openjdk8-tomcat9-ubi8-basic-s2i.json} (96%) rename templates/{jws57-openjdk8-tomcat9-ubi8-https-s2i.json => jws58-openjdk8-tomcat9-ubi8-https-s2i.json} (97%) create mode 100644 templates/jws58-openjdk8-tomcat9-ubi8-image-stream.json diff --git a/templates/jws57-openjdk11-tomcat9-ubi8-image-stream.json b/templates/jws57-openjdk11-tomcat9-ubi8-image-stream.json deleted file mode 100644 index fcbd1f9..0000000 --- a/templates/jws57-openjdk11-tomcat9-ubi8-image-stream.json +++ /dev/null @@ -1,232 +0,0 @@ -{ - "kind": "List", - "apiVersion": "v1", - "metadata": { - "name": "webserver57-openjdk11-tomcat9-ubi8-image-stream", - "annotations": { - "description": "ImageStream definition for Red Hat JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK11 on UBI8.", - "openshift.io/provider-display-name": "Red Hat, Inc." - } - }, - "items": [ - { - "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", - "metadata": { - "name": "jboss-webserver57-openjdk11-tomcat9-openshift-ubi8", - "annotations": { - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK11 on UBI8", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "5.7" - } - }, - "labels": { - "jws57jdk11ubi8": "5.7.8" - }, - "spec": { - "tags": [ - { - "name": "latest", - "annotations": { - "description": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK11 on UBI8 S2I images.", - "iconClass": "icon-rh-tomcat", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "supports": "tomcat9:5.7,tomcat:9,java:11", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "sampleContextDir": "tomcat-websocket-chat", - "version": "latest", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK11 on UBI8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk11-openshift-rhel8:latest" - } - }, - { - "name": "5.7.8", - "annotations": { - "description": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK11 on UBI8 S2I images.", - "iconClass": "icon-rh-tomcat", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "supports": "tomcat9:5.7,tomcat:9,java:11", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "sampleContextDir": "tomcat-websocket-chat", - "version": "5.7.8", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK11 on UBI8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk11-openshift-rhel8:5.7.8" - } - }, - { - "name": "5.7.7", - "annotations": { - "description": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK11 on UBI8 S2I images.", - "iconClass": "icon-rh-tomcat", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "supports": "tomcat9:5.7,tomcat:9,java:11", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "sampleContextDir": "tomcat-websocket-chat", - "version": "5.7.7", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK11 on UBI8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk11-openshift-rhel8:5.7.7" - } - }, - { - "name": "5.7.6", - "annotations": { - "description": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK11 on UBI8 S2I images.", - "iconClass": "icon-rh-tomcat", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "supports": "tomcat9:5.7,tomcat:9,java:11", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "sampleContextDir": "tomcat-websocket-chat", - "version": "5.7.6", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK11 on UBI8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk11-openshift-rhel8:5.7.6" - } - }, - { - "name": "5.7.5", - "annotations": { - "description": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK11 on UBI8 S2I images.", - "iconClass": "icon-rh-tomcat", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "supports": "tomcat9:5.7,tomcat:9,java:11", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "sampleContextDir": "tomcat-websocket-chat", - "version": "5.7.5", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK11 on UBI8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk11-openshift-rhel8:5.7.5" - } - }, - { - "name": "5.7.4", - "annotations": { - "description": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK11 on UBI8 S2I images.", - "iconClass": "icon-rh-tomcat", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "supports": "tomcat9:5.7,tomcat:9,java:11", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "sampleContextDir": "tomcat-websocket-chat", - "version": "5.7.4", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK11 on UBI8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk11-openshift-rhel8:5.7.4" - } - }, - { - "name": "5.7.3", - "annotations": { - "description": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK11 on UBI8 S2I images.", - "iconClass": "icon-rh-tomcat", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "supports": "tomcat9:5.7,tomcat:9,java:11", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "sampleContextDir": "tomcat-websocket-chat", - "version": "5.7.3", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK11 on UBI8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk11-openshift-rhel8:5.7.3" - } - }, - { - "name": "5.7.2", - "annotations": { - "description": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK11 on UBI8 S2I images.", - "iconClass": "icon-rh-tomcat", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "supports": "tomcat9:5.7,tomcat:9,java:11", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "sampleContextDir": "tomcat-websocket-chat", - "version": "5.7.2", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK11 on UBI8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk11-openshift-rhel8:5.7.2" - } - }, - { - "name": "5.7.1", - "annotations": { - "description": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK11 on UBI8 S2I images.", - "iconClass": "icon-rh-tomcat", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "supports": "tomcat9:5.7,tomcat:9,java:11", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "sampleContextDir": "tomcat-websocket-chat", - "version": "5.7.1", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK11 on UBI8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk11-openshift-rhel8:5.7.1" - } - }, - { - "name": "5.7.0", - "annotations": { - "description": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK11 on UBI8 S2I images.", - "iconClass": "icon-rh-tomcat", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "supports": "tomcat9:5.7,tomcat:9,java:11", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "sampleContextDir": "tomcat-websocket-chat", - "version": "5.7.0", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK11 on UBI8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk11-openshift-rhel8:5.7.0" - } - } - ] - } - } - ] -} diff --git a/templates/jws57-openjdk17-tomcat9-ubi8-image-stream.json b/templates/jws57-openjdk17-tomcat9-ubi8-image-stream.json deleted file mode 100644 index d69e602..0000000 --- a/templates/jws57-openjdk17-tomcat9-ubi8-image-stream.json +++ /dev/null @@ -1,192 +0,0 @@ -{ - "kind": "List", - "apiVersion": "v1", - "metadata": { - "name": "webserver57-openjdk17-tomcat9-ubi8-image-stream", - "annotations": { - "description": "ImageStream definition for Red Hat JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK17 on UBI8.", - "openshift.io/provider-display-name": "Red Hat, Inc." - } - }, - "items": [ - { - "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", - "metadata": { - "name": "jboss-webserver57-openjdk17-tomcat9-openshift-ubi8", - "annotations": { - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK17 on UBI8", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "5.7" - } - }, - "labels": { - "jws57jdk17ubi8": "5.7.8" - }, - "spec": { - "tags": [ - { - "name": "latest", - "annotations": { - "description": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK17 on UBI8 S2I images.", - "iconClass": "icon-rh-tomcat", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "supports": "tomcat9:5.7,tomcat:9,java:17", - "sampleRepo": "https://github.com/web-servers/tomcat-websocket-chat-quickstart.git", - "sampleContextDir": "tomcat-websocket-chat", - "version": "latest", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK17 on UBI8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk17-openshift-rhel8:latest" - } - }, - { - "name": "5.7.8", - "annotations": { - "description": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK17 on UBI8 S2I images.", - "iconClass": "icon-rh-tomcat", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "supports": "tomcat9:5.7,tomcat:9,java:17", - "sampleRepo": "https://github.com/web-servers/tomcat-websocket-chat-quickstart.git", - "sampleContextDir": "tomcat-websocket-chat", - "version": "5.7.8", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK17 on UBI8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk17-openshift-rhel8:5.7.8" - } - }, - { - "name": "5.7.7", - "annotations": { - "description": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK17 on UBI8 S2I images.", - "iconClass": "icon-rh-tomcat", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "supports": "tomcat9:5.7,tomcat:9,java:17", - "sampleRepo": "https://github.com/web-servers/tomcat-websocket-chat-quickstart.git", - "sampleContextDir": "tomcat-websocket-chat", - "version": "5.7.7", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK17 on UBI8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk17-openshift-rhel8:5.7.7" - } - }, - { - "name": "5.7.6", - "annotations": { - "description": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK17 on UBI8 S2I images.", - "iconClass": "icon-rh-tomcat", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "supports": "tomcat9:5.7,tomcat:9,java:17", - "sampleRepo": "https://github.com/web-servers/tomcat-websocket-chat-quickstart.git", - "sampleContextDir": "tomcat-websocket-chat", - "version": "5.7.6", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK17 on UBI8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk17-openshift-rhel8:5.7.6" - } - }, - { - "name": "5.7.5", - "annotations": { - "description": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK17 on UBI8 S2I images.", - "iconClass": "icon-rh-tomcat", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "supports": "tomcat9:5.7,tomcat:9,java:17", - "sampleRepo": "https://github.com/web-servers/tomcat-websocket-chat-quickstart.git", - "sampleContextDir": "tomcat-websocket-chat", - "version": "5.7.5", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK17 on UBI8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk17-openshift-rhel8:5.7.5" - } - }, - { - "name": "5.7.4", - "annotations": { - "description": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK17 on UBI8 S2I images.", - "iconClass": "icon-rh-tomcat", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "supports": "tomcat9:5.7,tomcat:9,java:17", - "sampleRepo": "https://github.com/web-servers/tomcat-websocket-chat-quickstart.git", - "sampleContextDir": "tomcat-websocket-chat", - "version": "5.7.4", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK17 on UBI8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk17-openshift-rhel8:5.7.4" - } - }, - { - "name": "5.7.3", - "annotations": { - "description": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK17 on UBI8 S2I images.", - "iconClass": "icon-rh-tomcat", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "supports": "tomcat9:5.7,tomcat:9,java:17", - "sampleRepo": "https://github.com/web-servers/tomcat-websocket-chat-quickstart.git", - "sampleContextDir": "tomcat-websocket-chat", - "version": "5.7.3", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK17 on UBI8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk17-openshift-rhel8:5.7.3" - } - }, - { - "name": "5.7.2", - "annotations": { - "description": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK17 on UBI8 S2I images.", - "iconClass": "icon-rh-tomcat", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "supports": "tomcat9:5.7,tomcat:9,java:17", - "sampleRepo": "https://github.com/web-servers/tomcat-websocket-chat-quickstart.git", - "sampleContextDir": "tomcat-websocket-chat", - "version": "5.7.2", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK17 on UBI8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk17-openshift-rhel8:5.7.2" - } - } - ] - } - } - ] -} diff --git a/templates/jws57-openjdk8-tomcat9-ubi8-image-stream.json b/templates/jws57-openjdk8-tomcat9-ubi8-image-stream.json deleted file mode 100644 index f8d2eb5..0000000 --- a/templates/jws57-openjdk8-tomcat9-ubi8-image-stream.json +++ /dev/null @@ -1,232 +0,0 @@ -{ - "kind": "List", - "apiVersion": "v1", - "metadata": { - "name": "webserver57-openjdk8-tomcat9-ubi8-image-stream", - "annotations": { - "description": "ImageStream definition for Red Hat JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK8 on UBI8.", - "openshift.io/provider-display-name": "Red Hat, Inc." - } - }, - "items": [ - { - "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", - "metadata": { - "name": "jboss-webserver57-openjdk8-tomcat9-openshift-ubi8", - "annotations": { - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK8 on UBI8", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "5.7" - } - }, - "labels": { - "jws57jdk8ubi8": "5.7.8" - }, - "spec": { - "tags": [ - { - "name": "latest", - "annotations": { - "description": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK8 on UBI8 S2I images.", - "iconClass": "icon-rh-tomcat", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "supports": "tomcat9:5.7,tomcat:9,java:8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "sampleContextDir": "tomcat-websocket-chat", - "version": "latest", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK8 on UBI8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk8-openshift-rhel8:latest" - } - }, - { - "name": "5.7.8", - "annotations": { - "description": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK8 on UBI8 S2I images.", - "iconClass": "icon-rh-tomcat", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "supports": "tomcat9:5.7,tomcat:9,java:8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "sampleContextDir": "tomcat-websocket-chat", - "version": "5.7.8", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK8 on UBI8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk8-openshift-rhel8:5.7.8" - } - }, - { - "name": "5.7.7", - "annotations": { - "description": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK8 on UBI8 S2I images.", - "iconClass": "icon-rh-tomcat", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "supports": "tomcat9:5.7,tomcat:9,java:8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "sampleContextDir": "tomcat-websocket-chat", - "version": "5.7.7", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK8 on UBI8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk8-openshift-rhel8:5.7.7" - } - }, - { - "name": "5.7.6", - "annotations": { - "description": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK8 on UBI8 S2I images.", - "iconClass": "icon-rh-tomcat", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "supports": "tomcat9:5.7,tomcat:9,java:8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "sampleContextDir": "tomcat-websocket-chat", - "version": "5.7.6", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK8 on UBI8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk8-openshift-rhel8:5.7.6" - } - }, - { - "name": "5.7.5", - "annotations": { - "description": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK8 on UBI8 S2I images.", - "iconClass": "icon-rh-tomcat", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "supports": "tomcat9:5.7,tomcat:9,java:8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "sampleContextDir": "tomcat-websocket-chat", - "version": "5.7.5", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK8 on UBI8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk8-openshift-rhel8:5.7.5" - } - }, - { - "name": "5.7.4", - "annotations": { - "description": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK8 on UBI8 S2I images.", - "iconClass": "icon-rh-tomcat", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "supports": "tomcat9:5.7,tomcat:9,java:8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "sampleContextDir": "tomcat-websocket-chat", - "version": "5.7.4", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK8 on UBI8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk8-openshift-rhel8:5.7.4" - } - }, - { - "name": "5.7.3", - "annotations": { - "description": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK8 on UBI8 S2I images.", - "iconClass": "icon-rh-tomcat", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "supports": "tomcat9:5.7,tomcat:9,java:8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "sampleContextDir": "tomcat-websocket-chat", - "version": "5.7.3", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK8 on UBI8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk8-openshift-rhel8:5.7.3" - } - }, - { - "name": "5.7.2", - "annotations": { - "description": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK8 on UBI8 S2I images.", - "iconClass": "icon-rh-tomcat", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "supports": "tomcat9:5.7,tomcat:9,java:8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "sampleContextDir": "tomcat-websocket-chat", - "version": "5.7.2", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK8 on UBI8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk8-openshift-rhel8:5.7.2" - } - }, - { - "name": "5.7.1", - "annotations": { - "description": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK8 on UBI8 S2I images.", - "iconClass": "icon-rh-tomcat", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "supports": "tomcat9:5.7,tomcat:9,java:8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "sampleContextDir": "tomcat-websocket-chat", - "version": "5.7.1", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK8 on UBI8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk8-openshift-rhel8:5.7.1" - } - }, - { - "name": "5.7.0", - "annotations": { - "description": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK8 on UBI8 S2I images.", - "iconClass": "icon-rh-tomcat", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "supports": "tomcat9:5.7,tomcat:9,java:8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "sampleContextDir": "tomcat-websocket-chat", - "version": "5.7.0", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK8 on UBI8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk8-openshift-rhel8:5.7.0" - } - } - ] - } - } - ] -} diff --git a/templates/jws57-openjdk11-tomcat9-ubi8-basic-s2i.json b/templates/jws58-openjdk11-tomcat9-ubi8-basic-s2i.json similarity index 96% rename from templates/jws57-openjdk11-tomcat9-ubi8-basic-s2i.json rename to templates/jws58-openjdk11-tomcat9-ubi8-basic-s2i.json index 657234c..d9d9da0 100644 --- a/templates/jws57-openjdk11-tomcat9-ubi8-basic-s2i.json +++ b/templates/jws58-openjdk11-tomcat9-ubi8-basic-s2i.json @@ -6,18 +6,18 @@ "iconClass": "icon-rh-tomcat", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "tomcat,tomcat9,java,jboss", - "version": "5.7", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK11 on UBI8 (no https)", + "version": "5.8", + "openshift.io/display-name": "JBoss Web Server 5.8 Apache Tomcat 9 OpenJDK11 on UBI8 (no https)", "description": "An example JBoss Web Server application. For more information about using this template, see https://github.com/jboss-openshift/application-templates.", - "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.7 Apache Tomcat 9 based application, including a build configuration, and an application deployment configuration.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.8 Apache Tomcat 9 based application, including a build configuration, and an application deployment configuration.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/", "template.openshift.io/support-url": "https://access.redhat.com" }, - "name": "jws57-openjdk11-tomcat9-ubi8-basic-s2i" + "name": "jws58-openjdk11-tomcat9-ubi8-basic-s2i" }, "labels": { - "template": "jws57-openjdk11-tomcat9-ubi8-basic-s2i", - "jws57jdk11ubi8": "5.7.8" + "template": "jws58-openjdk11-tomcat9-ubi8-basic-s2i", + "jws58jdk11ubi8": "5.8.0" }, "message": "A new JWS application for Apache Tomcat 9 has been created in your project.", "parameters": [ @@ -183,7 +183,7 @@ "from": { "kind": "ImageStreamTag", "namespace": "${IMAGE_STREAM_NAMESPACE}", - "name": "jboss-webserver57-openjdk11-tomcat9-openshift-ubi8:5.7.8" + "name": "jboss-webserver58-openjdk11-tomcat9-openshift-ubi8:5.8.0" } } }, diff --git a/templates/jws57-openjdk11-tomcat9-ubi8-https-s2i.json b/templates/jws58-openjdk11-tomcat9-ubi8-https-s2i.json similarity index 97% rename from templates/jws57-openjdk11-tomcat9-ubi8-https-s2i.json rename to templates/jws58-openjdk11-tomcat9-ubi8-https-s2i.json index 5b73151..697e8e3 100644 --- a/templates/jws57-openjdk11-tomcat9-ubi8-https-s2i.json +++ b/templates/jws58-openjdk11-tomcat9-ubi8-https-s2i.json @@ -6,19 +6,19 @@ "iconClass": "icon-rh-tomcat", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "tomcat,tomcat9,java,jboss,hidden", - "version": "5.7", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK11 on UBI8 (with https)", + "version": "5.8", + "openshift.io/display-name": "JBoss Web Server 5.8 Apache Tomcat 9 OpenJDK11 on UBI8 (with https)", "description": "An example JBoss Web Server application. For more information about using this template, see https://github.com/jboss-openshift/application-templates.", - "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.7 Apache Tomcat 9 based application, including a build configuration, application deployment configuration, and secure communication using https.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.8 Apache Tomcat 9 based application, including a build configuration, application deployment configuration, and secure communication using https.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/", "template.openshift.io/support-url": "https://access.redhat.com" }, - "name": "jws57-openjdk11-tomcat9-ubi8-https-s2i" + "name": "jws58-openjdk11-tomcat9-ubi8-https-s2i" }, "labels": { - "template": "jws57-openjdk11-tomcat9-ubi8-https-s2i", - "jws57jdk11ubi8": "5.7.8" + "template": "jws58-openjdk11-tomcat9-ubi8-https-s2i", + "jws58jdk11ubi8": "5.8.0" }, "message": "A new JWS application for Apache Tomcat 9 has been created in your project. Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.", "parameters": [ @@ -266,7 +266,7 @@ "from": { "kind": "ImageStreamTag", "namespace": "${IMAGE_STREAM_NAMESPACE}", - "name": "jboss-webserver57-openjdk11-tomcat9-openshift-ubi8:5.7.8" + "name": "jboss-webserver58-openjdk11-tomcat9-openshift-ubi8:5.8.0" } } }, diff --git a/templates/jws58-openjdk11-tomcat9-ubi8-image-stream.json b/templates/jws58-openjdk11-tomcat9-ubi8-image-stream.json new file mode 100644 index 0000000..453e259 --- /dev/null +++ b/templates/jws58-openjdk11-tomcat9-ubi8-image-stream.json @@ -0,0 +1,72 @@ +{ + "kind": "List", + "apiVersion": "v1", + "metadata": { + "name": "webserver58-openjdk11-tomcat9-ubi8-image-stream", + "annotations": { + "description": "ImageStream definition for Red Hat JBoss Web Server 5.8 Apache Tomcat 9 OpenJDK11 on UBI8.", + "openshift.io/provider-display-name": "Red Hat, Inc." + } + }, + "items": [ + { + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "jboss-webserver58-openjdk11-tomcat9-openshift-ubi8", + "annotations": { + "openshift.io/display-name": "JBoss Web Server 5.8 Apache Tomcat 9 OpenJDK11 on UBI8", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "version": "5.8" + } + }, + "labels": { + "jws58jdk11ubi8": "5.8.0" + }, + "spec": { + "tags": [ + { + "name": "latest", + "annotations": { + "description": "JBoss Web Server 5.8 Apache Tomcat 9 OpenJDK11 on UBI8 S2I images.", + "iconClass": "icon-rh-tomcat", + "tags": "builder,tomcat,tomcat9,java,jboss,hidden", + "supports": "tomcat9:5.8,tomcat:9,java:11", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", + "sampleContextDir": "tomcat-websocket-chat", + "version": "latest", + "openshift.io/display-name": "JBoss Web Server 5.8 Apache Tomcat 9 OpenJDK11 on UBI8" + }, + "referencePolicy": { + "type": "Local" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/jboss-webserver-5/jws58-openjdk11-openshift-rhel8:latest" + } + }, + { + "name": "5.8.0", + "annotations": { + "description": "JBoss Web Server 5.8 Apache Tomcat 9 OpenJDK11 on UBI8 S2I images.", + "iconClass": "icon-rh-tomcat", + "tags": "builder,tomcat,tomcat9,java,jboss,hidden", + "supports": "tomcat9:5.8,tomcat:9,java:11", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", + "sampleContextDir": "tomcat-websocket-chat", + "version": "5.8.0", + "openshift.io/display-name": "JBoss Web Server 5.8 Apache Tomcat 9 OpenJDK11 on UBI8" + }, + "referencePolicy": { + "type": "Local" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/jboss-webserver-5/jws58-openjdk11-openshift-rhel8:5.8.0" + } + } + ] + } + } + ] +} diff --git a/templates/jws57-openjdk17-tomcat9-ubi8-basic-s2i.json b/templates/jws58-openjdk17-tomcat9-ubi8-basic-s2i.json similarity index 96% rename from templates/jws57-openjdk17-tomcat9-ubi8-basic-s2i.json rename to templates/jws58-openjdk17-tomcat9-ubi8-basic-s2i.json index 4085013..2391ec0 100644 --- a/templates/jws57-openjdk17-tomcat9-ubi8-basic-s2i.json +++ b/templates/jws58-openjdk17-tomcat9-ubi8-basic-s2i.json @@ -6,18 +6,18 @@ "iconClass": "icon-rh-tomcat", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "tomcat,tomcat9,java,jboss", - "version": "5.7", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK17 on UBI8 (no https)", + "version": "5.8", + "openshift.io/display-name": "JBoss Web Server 5.8 Apache Tomcat 9 OpenJDK17 on UBI8 (no https)", "description": "An example JBoss Web Server application. For more information about using this template, see https://github.com/jboss-openshift/application-templates.", - "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.7 Apache Tomcat 9 based application, including a build configuration, and an application deployment configuration.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.8 Apache Tomcat 9 based application, including a build configuration, and an application deployment configuration.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/", "template.openshift.io/support-url": "https://access.redhat.com" }, - "name": "jws57-openjdk17-tomcat9-ubi8-basic-s2i" + "name": "jws58-openjdk17-tomcat9-ubi8-basic-s2i" }, "labels": { - "template": "jws57-openjdk17-tomcat9-ubi8-basic-s2i", - "jws57jdk17ubi8": "5.7.8" + "template": "jws58-openjdk17-tomcat9-ubi8-basic-s2i", + "jws58jdk17ubi8": "5.8.0" }, "message": "A new JWS application for Apache Tomcat 9 has been created in your project.", "parameters": [ @@ -183,7 +183,7 @@ "from": { "kind": "ImageStreamTag", "namespace": "${IMAGE_STREAM_NAMESPACE}", - "name": "jboss-webserver57-openjdk17-tomcat9-openshift-ubi8:5.7.8" + "name": "jboss-webserver58-openjdk17-tomcat9-openshift-ubi8:5.8.0" } } }, diff --git a/templates/jws57-openjdk17-tomcat9-ubi8-https-s2i.json b/templates/jws58-openjdk17-tomcat9-ubi8-https-s2i.json similarity index 97% rename from templates/jws57-openjdk17-tomcat9-ubi8-https-s2i.json rename to templates/jws58-openjdk17-tomcat9-ubi8-https-s2i.json index 34582b0..a33d1cf 100644 --- a/templates/jws57-openjdk17-tomcat9-ubi8-https-s2i.json +++ b/templates/jws58-openjdk17-tomcat9-ubi8-https-s2i.json @@ -6,19 +6,19 @@ "iconClass": "icon-rh-tomcat", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "tomcat,tomcat9,java,jboss,hidden", - "version": "5.7", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK17 on UBI8 (with https)", + "version": "5.8", + "openshift.io/display-name": "JBoss Web Server 5.8 Apache Tomcat 9 OpenJDK17 on UBI8 (with https)", "description": "An example JBoss Web Server application. For more information about using this template, see https://github.com/jboss-openshift/application-templates.", - "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.7 Apache Tomcat 9 based application, including a build configuration, application deployment configuration, and secure communication using https.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.8 Apache Tomcat 9 based application, including a build configuration, application deployment configuration, and secure communication using https.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/", "template.openshift.io/support-url": "https://access.redhat.com" }, - "name": "jws57-openjdk17-tomcat9-ubi8-https-s2i" + "name": "jws58-openjdk17-tomcat9-ubi8-https-s2i" }, "labels": { - "template": "jws57-openjdk17-tomcat9-ubi8-https-s2i", - "jws57jdk17ubi8": "5.7.8" + "template": "jws58-openjdk17-tomcat9-ubi8-https-s2i", + "jws58jdk17ubi8": "5.8.0" }, "message": "A new JWS application for Apache Tomcat 9 has been created in your project. Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.", "parameters": [ @@ -266,7 +266,7 @@ "from": { "kind": "ImageStreamTag", "namespace": "${IMAGE_STREAM_NAMESPACE}", - "name": "jboss-webserver57-openjdk17-tomcat9-openshift-ubi8:5.7.8" + "name": "jboss-webserver58-openjdk17-tomcat9-openshift-ubi8:5.8.0" } } }, diff --git a/templates/jws58-openjdk17-tomcat9-ubi8-image-stream.json b/templates/jws58-openjdk17-tomcat9-ubi8-image-stream.json new file mode 100644 index 0000000..9f31be4 --- /dev/null +++ b/templates/jws58-openjdk17-tomcat9-ubi8-image-stream.json @@ -0,0 +1,72 @@ +{ + "kind": "List", + "apiVersion": "v1", + "metadata": { + "name": "webserver58-openjdk17-tomcat9-ubi8-image-stream", + "annotations": { + "description": "ImageStream definition for Red Hat JBoss Web Server 5.8 Apache Tomcat 9 OpenJDK17 on UBI8.", + "openshift.io/provider-display-name": "Red Hat, Inc." + } + }, + "items": [ + { + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "jboss-webserver58-openjdk17-tomcat9-openshift-ubi8", + "annotations": { + "openshift.io/display-name": "JBoss Web Server 5.8 Apache Tomcat 9 OpenJDK17 on UBI8", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "version": "5.8" + } + }, + "labels": { + "jws58jdk17ubi8": "5.8.0" + }, + "spec": { + "tags": [ + { + "name": "latest", + "annotations": { + "description": "JBoss Web Server 5.8 Apache Tomcat 9 OpenJDK17 on UBI8 S2I images.", + "iconClass": "icon-rh-tomcat", + "tags": "builder,tomcat,tomcat9,java,jboss,hidden", + "supports": "tomcat9:5.8,tomcat:9,java:17", + "sampleRepo": "https://github.com/web-servers/tomcat-websocket-chat-quickstart.git", + "sampleContextDir": "tomcat-websocket-chat", + "version": "latest", + "openshift.io/display-name": "JBoss Web Server 5.8 Apache Tomcat 9 OpenJDK17 on UBI8" + }, + "referencePolicy": { + "type": "Local" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/jboss-webserver-5/jws58-openjdk17-openshift-rhel8:latest" + } + }, + { + "name": "5.8.0", + "annotations": { + "description": "JBoss Web Server 5.8 Apache Tomcat 9 OpenJDK17 on UBI8 S2I images.", + "iconClass": "icon-rh-tomcat", + "tags": "builder,tomcat,tomcat9,java,jboss,hidden", + "supports": "tomcat9:5.8,tomcat:9,java:17", + "sampleRepo": "https://github.com/web-servers/tomcat-websocket-chat-quickstart.git", + "sampleContextDir": "tomcat-websocket-chat", + "version": "5.8.0", + "openshift.io/display-name": "JBoss Web Server 5.8 Apache Tomcat 9 OpenJDK17 on UBI8" + }, + "referencePolicy": { + "type": "Local" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/jboss-webserver-5/jws58-openjdk17-openshift-rhel8:5.8.0" + } + } + ] + } + } + ] +} diff --git a/templates/jws57-openjdk8-tomcat9-ubi8-basic-s2i.json b/templates/jws58-openjdk8-tomcat9-ubi8-basic-s2i.json similarity index 96% rename from templates/jws57-openjdk8-tomcat9-ubi8-basic-s2i.json rename to templates/jws58-openjdk8-tomcat9-ubi8-basic-s2i.json index 3250105..1316c54 100644 --- a/templates/jws57-openjdk8-tomcat9-ubi8-basic-s2i.json +++ b/templates/jws58-openjdk8-tomcat9-ubi8-basic-s2i.json @@ -6,18 +6,18 @@ "iconClass": "icon-rh-tomcat", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "tomcat,tomcat9,java,jboss", - "version": "5.7", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK8 on UBI8 (no https)", + "version": "5.8", + "openshift.io/display-name": "JBoss Web Server 5.8 Apache Tomcat 9 OpenJDK8 on UBI8 (no https)", "description": "An example JBoss Web Server application. For more information about using this template, see https://github.com/jboss-openshift/application-templates.", - "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.7 Apache Tomcat 9 based application, including a build configuration, and an application deployment configuration.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.8 Apache Tomcat 9 based application, including a build configuration, and an application deployment configuration.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/", "template.openshift.io/support-url": "https://access.redhat.com" }, - "name": "jws57-openjdk8-tomcat9-ubi8-basic-s2i" + "name": "jws58-openjdk8-tomcat9-ubi8-basic-s2i" }, "labels": { - "template": "jws57-openjdk8-tomcat9-ubi8-basic-s2i", - "jws57jdk8ubi8": "5.7.8" + "template": "jws58-openjdk8-tomcat9-ubi8-basic-s2i", + "jws58jdk8ubi8": "5.8.0" }, "message": "A new JWS application for Apache Tomcat 9 has been created in your project.", "parameters": [ @@ -183,7 +183,7 @@ "from": { "kind": "ImageStreamTag", "namespace": "${IMAGE_STREAM_NAMESPACE}", - "name": "jboss-webserver57-openjdk8-tomcat9-openshift-ubi8:5.7.8" + "name": "jboss-webserver58-openjdk8-tomcat9-openshift-ubi8:5.8.0" } } }, diff --git a/templates/jws57-openjdk8-tomcat9-ubi8-https-s2i.json b/templates/jws58-openjdk8-tomcat9-ubi8-https-s2i.json similarity index 97% rename from templates/jws57-openjdk8-tomcat9-ubi8-https-s2i.json rename to templates/jws58-openjdk8-tomcat9-ubi8-https-s2i.json index e92bca6..c2f2226 100644 --- a/templates/jws57-openjdk8-tomcat9-ubi8-https-s2i.json +++ b/templates/jws58-openjdk8-tomcat9-ubi8-https-s2i.json @@ -6,19 +6,19 @@ "iconClass": "icon-rh-tomcat", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "tomcat,tomcat9,java,jboss,hidden", - "version": "5.7", - "openshift.io/display-name": "JBoss Web Server 5.7 Apache Tomcat 9 OpenJDK8 on UBI8 (with https)", + "version": "5.8", + "openshift.io/display-name": "JBoss Web Server 5.8 Apache Tomcat 9 OpenJDK8 on UBI8 (with https)", "description": "An example JBoss Web Server application. For more information about using this template, see https://github.com/jboss-openshift/application-templates.", - "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.7 Apache Tomcat 9 based application, including a build configuration, application deployment configuration, and secure communication using https.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.8 Apache Tomcat 9 based application, including a build configuration, application deployment configuration, and secure communication using https.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/", "template.openshift.io/support-url": "https://access.redhat.com" }, - "name": "jws57-openjdk8-tomcat9-ubi8-https-s2i" + "name": "jws58-openjdk8-tomcat9-ubi8-https-s2i" }, "labels": { - "template": "jws57-openjdk8-tomcat9-ubi8-https-s2i", - "jws57jdk8ubi8": "5.7.8" + "template": "jws58-openjdk8-tomcat9-ubi8-https-s2i", + "jws58jdk8ubi8": "5.8.0" }, "message": "A new JWS application for Apache Tomcat 9 has been created in your project. Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.", "parameters": [ @@ -266,7 +266,7 @@ "from": { "kind": "ImageStreamTag", "namespace": "${IMAGE_STREAM_NAMESPACE}", - "name": "jboss-webserver57-openjdk8-tomcat9-openshift-ubi8:5.7.8" + "name": "jboss-webserver58-openjdk8-tomcat9-openshift-ubi8:5.8.0" } } }, diff --git a/templates/jws58-openjdk8-tomcat9-ubi8-image-stream.json b/templates/jws58-openjdk8-tomcat9-ubi8-image-stream.json new file mode 100644 index 0000000..705344d --- /dev/null +++ b/templates/jws58-openjdk8-tomcat9-ubi8-image-stream.json @@ -0,0 +1,72 @@ +{ + "kind": "List", + "apiVersion": "v1", + "metadata": { + "name": "webserver58-openjdk8-tomcat9-ubi8-image-stream", + "annotations": { + "description": "ImageStream definition for Red Hat JBoss Web Server 5.8 Apache Tomcat 9 OpenJDK8 on UBI8.", + "openshift.io/provider-display-name": "Red Hat, Inc." + } + }, + "items": [ + { + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "jboss-webserver58-openjdk8-tomcat9-openshift-ubi8", + "annotations": { + "openshift.io/display-name": "JBoss Web Server 5.8 Apache Tomcat 9 OpenJDK8 on UBI8", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "version": "5.8" + } + }, + "labels": { + "jws58jdk8ubi8": "5.8.0" + }, + "spec": { + "tags": [ + { + "name": "latest", + "annotations": { + "description": "JBoss Web Server 5.8 Apache Tomcat 9 OpenJDK8 on UBI8 S2I images.", + "iconClass": "icon-rh-tomcat", + "tags": "builder,tomcat,tomcat9,java,jboss,hidden", + "supports": "tomcat9:5.8,tomcat:9,java:8", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", + "sampleContextDir": "tomcat-websocket-chat", + "version": "latest", + "openshift.io/display-name": "JBoss Web Server 5.8 Apache Tomcat 9 OpenJDK8 on UBI8" + }, + "referencePolicy": { + "type": "Local" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/jboss-webserver-5/jws58-openjdk8-openshift-rhel8:latest" + } + }, + { + "name": "5.8.0", + "annotations": { + "description": "JBoss Web Server 5.8 Apache Tomcat 9 OpenJDK8 on UBI8 S2I images.", + "iconClass": "icon-rh-tomcat", + "tags": "builder,tomcat,tomcat9,java,jboss,hidden", + "supports": "tomcat9:5.8,tomcat:9,java:8", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", + "sampleContextDir": "tomcat-websocket-chat", + "version": "5.8.0", + "openshift.io/display-name": "JBoss Web Server 5.8 Apache Tomcat 9 OpenJDK8 on UBI8" + }, + "referencePolicy": { + "type": "Local" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/jboss-webserver-5/jws58-openjdk8-openshift-rhel8:5.8.0" + } + } + ] + } + } + ] +} diff --git a/tomcat9/image.yaml b/tomcat9/image.yaml index 64c3b81..b0c77af 100644 --- a/tomcat9/image.yaml +++ b/tomcat9/image.yaml @@ -1,16 +1,16 @@ schema_version: 1 -name: "jboss-webserver-5/jws57-openjdk8-rhel8-openshift" -description: "Red Hat JBoss Web Server 5.7 - Tomcat 9 OpenShift container image with OpenJDK8 on UBI8" -version: "5.7.8" -from: "jboss-webserver-5/webserver57-openjdk8-tomcat9-rhel8:5.7.8" +name: "jboss-webserver-5/jws58-openjdk8-rhel8-openshift" +description: "Red Hat JBoss Web Server 5.8 - Tomcat 9 OpenShift container image with OpenJDK8 on UBI8" +version: "5.8.0" +from: "jboss-webserver-5/webserver58-openjdk8-tomcat9-rhel8:5.8.0" labels: - name: "com.redhat.component" - value: "jboss-webserver-57-openjdk8-rhel8-openshift-container" + value: "jboss-webserver-58-openjdk8-rhel8-openshift-container" - name: "io.k8s.description" - value: "Platform for building and running web applications on JBoss Web Server 5.7 with OpenJDK8 - Tomcat v9" + value: "Platform for building and running web applications on JBoss Web Server 5.8 with OpenJDK8 - Tomcat v9" - name: "io.k8s.display-name" - value: "JBoss Web Server 5.7 OpenJDK8" + value: "JBoss Web Server 5.8 OpenJDK8" - name: "io.openshift.expose-services" value: "8080:http" - name: "io.openshift.tags" @@ -23,7 +23,7 @@ envs: - name: "STI_BUILDER" value: "jee" - name: JWS_HTTPS_CERTIFICATE_DIR - example: /opt/jws-5.7/tomcat/conf + example: /opt/jws-5.8/tomcat/conf - name: JWS_HTTPS_CERTIFICATE example: server.crt - name: JWS_HTTPS_CERTIFICATE_KEY @@ -141,4 +141,4 @@ packages: run: user: 185 cmd: - - "/opt/jws-5.7/tomcat/bin/launch.sh" + - "/opt/jws-5.8/tomcat/bin/launch.sh" diff --git a/tomcat9/jdk11-overrides.yaml b/tomcat9/jdk11-overrides.yaml index 9e7c92b..0e620c4 100644 --- a/tomcat9/jdk11-overrides.yaml +++ b/tomcat9/jdk11-overrides.yaml @@ -1,16 +1,16 @@ schema_version: 1 -name: "jboss-webserver-5/jws57-openjdk11-rhel8-openshift" -description: "Red Hat JBoss Web Server 5.7 - Tomcat 9 OpenShift container image with OpenJDK11 on UBI8" -version: "5.7.8" -from: "jboss-webserver-5/webserver57-openjdk11-tomcat9-rhel8:5.7.8" +name: "jboss-webserver-5/jws58-openjdk11-rhel8-openshift" +description: "Red Hat JBoss Web Server 5.8 - Tomcat 9 OpenShift container image with OpenJDK11 on UBI8" +version: "5.8.0" +from: "jboss-webserver-5/webserver58-openjdk11-tomcat9-rhel8:5.8.0" labels: - name: "com.redhat.component" - value: "jboss-webserver-57-openjdk11-rhel8-openshift-container" + value: "jboss-webserver-58-openjdk11-rhel8-openshift-container" - name: "io.k8s.description" - value: "Platform for building and running web applications on JBoss Web Server 5.7 with OpenJDK11 - Tomcat v9" + value: "Platform for building and running web applications on JBoss Web Server 5.8 with OpenJDK11 - Tomcat v9" - name: "io.k8s.display-name" - value: "JBoss Web Server 5.7 OpenJDK11" + value: "JBoss Web Server 5.8 OpenJDK11" modules: repositories: - name: cct_module @@ -40,7 +40,7 @@ packages: osbs: repository: name: containers/jboss-webserver-openjdk11-tomcat9 - branch: jws-5.7-openshift-rhel-8 + branch: jws-5.8-openshift-rhel-8 configuration: container: compose: diff --git a/tomcat9/jdk17-overrides.yaml b/tomcat9/jdk17-overrides.yaml index 1694085..ab9016c 100644 --- a/tomcat9/jdk17-overrides.yaml +++ b/tomcat9/jdk17-overrides.yaml @@ -1,16 +1,16 @@ schema_version: 1 -name: "jboss-webserver-5/jws57-openjdk17-rhel8-openshift" -description: "Red Hat JBoss Web Server 5.7 - Tomcat 9 OpenShift container image with OpenJDK17 on UBI8" -version: "5.7.8" -from: "jboss-webserver-5/webserver57-openjdk17-tomcat9-rhel8:5.7.8" +name: "jboss-webserver-5/jws58-openjdk17-rhel8-openshift" +description: "Red Hat JBoss Web Server 5.8 - Tomcat 9 OpenShift container image with OpenJDK17 on UBI8" +version: "5.8.0" +from: "jboss-webserver-5/webserver58-openjdk17-tomcat9-rhel8:5.8.0" labels: - name: "com.redhat.component" - value: "jboss-webserver-57-openjdk17-rhel8-openshift-container" + value: "jboss-webserver-58-openjdk17-rhel8-openshift-container" - name: "io.k8s.description" - value: "Platform for building and running web applications on JBoss Web Server 5.7 with OpenJDK17 - Tomcat v9" + value: "Platform for building and running web applications on JBoss Web Server 5.8 with OpenJDK17 - Tomcat v9" - name: "io.k8s.display-name" - value: "JBoss Web Server 5.7 OpenJDK17" + value: "JBoss Web Server 5.8 OpenJDK17" modules: repositories: - name: cct_module @@ -40,7 +40,7 @@ packages: osbs: repository: name: containers/jboss-webserver-openjdk17-tomcat9 - branch: jws-5.7-openshift-rhel-8 + branch: jws-5.8-openshift-rhel-8 configuration: container: compose: diff --git a/tomcat9/jdk8-overrides.yaml b/tomcat9/jdk8-overrides.yaml index 720983d..4d30394 100644 --- a/tomcat9/jdk8-overrides.yaml +++ b/tomcat9/jdk8-overrides.yaml @@ -19,7 +19,7 @@ modules: osbs: repository: name: containers/jboss-webserver-openjdk8-tomcat9 - branch: jws-5.7-openshift-rhel-8 + branch: jws-5.8-openshift-rhel-8 configuration: container: compose: