From 1c643f6bc6a2920e740588cde0f97d80821e462d Mon Sep 17 00:00:00 2001 From: Sokratis Zappis Date: Thu, 10 Nov 2022 22:43:48 +0200 Subject: [PATCH] Update to 5.7.1 Signed-off-by: Sokratis Zappis --- ...ws57-openjdk11-tomcat9-ubi8-basic-s2i.json | 4 ++-- ...ws57-openjdk11-tomcat9-ubi8-https-s2i.json | 4 ++-- ...7-openjdk11-tomcat9-ubi8-image-stream.json | 22 ++++++++++++++++++- ...jws57-openjdk8-tomcat9-ubi8-basic-s2i.json | 4 ++-- ...jws57-openjdk8-tomcat9-ubi8-https-s2i.json | 4 ++-- ...57-openjdk8-tomcat9-ubi8-image-stream.json | 22 ++++++++++++++++++- tomcat9/image.yaml | 4 ++-- tomcat9/jdk11-overrides.yaml | 4 ++-- 8 files changed, 54 insertions(+), 14 deletions(-) diff --git a/templates/jws57-openjdk11-tomcat9-ubi8-basic-s2i.json b/templates/jws57-openjdk11-tomcat9-ubi8-basic-s2i.json index f3fed4b..c6df8c8 100644 --- a/templates/jws57-openjdk11-tomcat9-ubi8-basic-s2i.json +++ b/templates/jws57-openjdk11-tomcat9-ubi8-basic-s2i.json @@ -17,7 +17,7 @@ }, "labels": { "template": "jws57-openjdk11-tomcat9-ubi8-basic-s2i", - "jws57jdk11ubi8": "5.7.0" + "jws57jdk11ubi8": "5.7.1" }, "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.0" + "name": "jboss-webserver57-openjdk11-tomcat9-openshift-ubi8:5.7.1" } } }, diff --git a/templates/jws57-openjdk11-tomcat9-ubi8-https-s2i.json b/templates/jws57-openjdk11-tomcat9-ubi8-https-s2i.json index 78e9924..0ea4890 100644 --- a/templates/jws57-openjdk11-tomcat9-ubi8-https-s2i.json +++ b/templates/jws57-openjdk11-tomcat9-ubi8-https-s2i.json @@ -18,7 +18,7 @@ }, "labels": { "template": "jws57-openjdk11-tomcat9-ubi8-https-s2i", - "jws57jdk11ubi8": "5.7.0" + "jws57jdk11ubi8": "5.7.1" }, "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.0" + "name": "jboss-webserver57-openjdk11-tomcat9-openshift-ubi8:5.7.1" } } }, diff --git a/templates/jws57-openjdk11-tomcat9-ubi8-image-stream.json b/templates/jws57-openjdk11-tomcat9-ubi8-image-stream.json index 849d2e3..3d38e6b 100644 --- a/templates/jws57-openjdk11-tomcat9-ubi8-image-stream.json +++ b/templates/jws57-openjdk11-tomcat9-ubi8-image-stream.json @@ -21,7 +21,7 @@ } }, "labels": { - "jws56jdk11ubi8": "5.7.0" + "jws57jdk11ubi8": "5.7.1" }, "spec": { "tags": [ @@ -45,6 +45,26 @@ "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk11-openshift-rhel8:latest" } }, + { + "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": "1.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.1" + } + }, { "name": "5.7.0", "annotations": { diff --git a/templates/jws57-openjdk8-tomcat9-ubi8-basic-s2i.json b/templates/jws57-openjdk8-tomcat9-ubi8-basic-s2i.json index b158fec..5b19d54 100644 --- a/templates/jws57-openjdk8-tomcat9-ubi8-basic-s2i.json +++ b/templates/jws57-openjdk8-tomcat9-ubi8-basic-s2i.json @@ -17,7 +17,7 @@ }, "labels": { "template": "jws57-openjdk8-tomcat9-ubi8-basic-s2i", - "jws57jdk8ubi8": "5.7.0" + "jws57jdk8ubi8": "5.7.1" }, "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.0" + "name": "jboss-webserver57-openjdk8-tomcat9-openshift-ubi8:5.7.1" } } }, diff --git a/templates/jws57-openjdk8-tomcat9-ubi8-https-s2i.json b/templates/jws57-openjdk8-tomcat9-ubi8-https-s2i.json index f7f8c93..64b358b 100644 --- a/templates/jws57-openjdk8-tomcat9-ubi8-https-s2i.json +++ b/templates/jws57-openjdk8-tomcat9-ubi8-https-s2i.json @@ -18,7 +18,7 @@ }, "labels": { "template": "jws57-openjdk8-tomcat9-ubi8-https-s2i", - "jws57jdk8ubi8": "5.7.0" + "jws57jdk8ubi8": "5.7.1" }, "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.0" + "name": "jboss-webserver57-openjdk8-tomcat9-openshift-ubi8:5.7.1" } } }, diff --git a/templates/jws57-openjdk8-tomcat9-ubi8-image-stream.json b/templates/jws57-openjdk8-tomcat9-ubi8-image-stream.json index 4291892..bf29014 100644 --- a/templates/jws57-openjdk8-tomcat9-ubi8-image-stream.json +++ b/templates/jws57-openjdk8-tomcat9-ubi8-image-stream.json @@ -21,7 +21,7 @@ } }, "labels": { - "jws56jdk8ubi8": "5.7.0" + "jws57jdk8ubi8": "5.7.1" }, "spec": { "tags": [ @@ -45,6 +45,26 @@ "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk8-openshift-rhel8:latest" } }, + { + "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": "1.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.1" + } + }, { "name": "5.7.0", "annotations": { diff --git a/tomcat9/image.yaml b/tomcat9/image.yaml index d035188..242aebc 100644 --- a/tomcat9/image.yaml +++ b/tomcat9/image.yaml @@ -2,8 +2,8 @@ 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.0" -from: "jboss-webserver-5/webserver57-openjdk8-tomcat9-rhel8:5.7.0" +version: "5.7.1" +from: "jboss-webserver-5/webserver57-openjdk8-tomcat9-rhel8:5.7.1" labels: - name: "com.redhat.component" value: "jboss-webserver-57-openjdk8-rhel8-openshift-container" diff --git a/tomcat9/jdk11-overrides.yaml b/tomcat9/jdk11-overrides.yaml index 4f9a4fd..0d5f9d2 100644 --- a/tomcat9/jdk11-overrides.yaml +++ b/tomcat9/jdk11-overrides.yaml @@ -2,8 +2,8 @@ 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.0" -from: "jboss-webserver-5/webserver57-openjdk11-tomcat9-rhel8:5.7.0" +version: "5.7.1" +from: "jboss-webserver-5/webserver57-openjdk11-tomcat9-rhel8:5.7.1" labels: - name: "com.redhat.component" value: "jboss-webserver-57-openjdk11-rhel8-openshift-container"