Merge pull request #50 from bekionel/webserver57-dev-rhel8

Updates for JWS 5.7.2 .
jboss-container-images · Apr 4, 2023 · 0dd71af · 0dd71af
2 parents f9837c8 + e912445
commit 0dd71af
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 83 deletions.
diff --git 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.1"
+        "jws57jdk11ubi8": "5.7.2"
     },
     "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.1"
+                            "name": "jboss-webserver57-openjdk11-tomcat9-openshift-ubi8:5.7.2"
                         }
                     }
                 },

diff --git 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.1"
+        "jws57jdk11ubi8": "5.7.2"
     },
     "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.1"
+                            "name": "jboss-webserver57-openjdk11-tomcat9-openshift-ubi8:5.7.2"
                         }
                     }
                 },

diff --git a/templates/jws57-openjdk11-tomcat9-ubi8-image-stream.json b/templates/jws57-openjdk11-tomcat9-ubi8-image-stream.json
@@ -21,7 +21,7 @@
                 }
             },
             "labels": {
-                "jws57jdk11ubi8": "5.7.1"
+                "jws57jdk11ubi8": "5.7.2"
             },
             "spec": {
                 "tags": [
@@ -45,6 +45,26 @@
                             "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk11-openshift-rhel8:latest"
                         }
                     },
+                    {
+                        "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": "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.2"
+                        }
+                    },
                     {
                         "name": "5.7.1",
                         "annotations": {

diff --git 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.1"
+        "jws57jdk8ubi8": "5.7.2"
     },
     "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.1"
+                            "name": "jboss-webserver57-openjdk8-tomcat9-openshift-ubi8:5.7.2"
                         }
                     }
                 },

diff --git 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.1"
+        "jws57jdk8ubi8": "5.7.2"
     },
     "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.1"
+                            "name": "jboss-webserver57-openjdk8-tomcat9-openshift-ubi8:5.7.2"
                         }
                     }
                 },

diff --git a/templates/jws57-openjdk8-tomcat9-ubi8-image-stream.json b/templates/jws57-openjdk8-tomcat9-ubi8-image-stream.json
@@ -21,7 +21,7 @@
                 }
             },
             "labels": {
-                "jws57jdk8ubi8": "5.7.1"
+                "jws57jdk8ubi8": "5.7.2"
             },
             "spec": {
                 "tags": [
@@ -45,6 +45,26 @@
                             "name": "registry.redhat.io/jboss-webserver-5/jws57-openjdk8-openshift-rhel8:latest"
                         }
                     },
+                    {
+                        "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": "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.2"
+                        }
+                    },
                     {
                         "name": "5.7.1",
                         "annotations": {

diff --git 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.1"
-from: "jboss-webserver-5/webserver57-openjdk8-tomcat9-rhel8:5.7.1"
+version: "5.7.2"
+from: "jboss-webserver-5/webserver57-openjdk8-tomcat9-rhel8:5.7.2"
 labels:
     - name: "com.redhat.component"
       value: "jboss-webserver-57-openjdk8-rhel8-openshift-container"
@@ -93,7 +93,7 @@ modules:
                   ref: master
           - name: jboss-jws-modules
             git:
-                  url: https://github.com/web-servers/jboss-jws-container-images-modules
+                  url: https://github.com/web-servers/jboss-jws-container-images-modules.git
                   ref: main
           - path: custom-modules
       install:
@@ -129,6 +129,10 @@ modules:
           - name: jboss.container.util.logging.bash
           - name: os-eap-python
             version: "3.6"
+          - name: os-jws-prometheus
+            version: "3.0"
+          - name: jws5-logging
+            version: "1.0"
 
 packages:
       content_sets_file: content_sets.yml

diff --git 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.1"
-from: "jboss-webserver-5/webserver57-openjdk11-tomcat9-rhel8:5.7.1"
+version: "5.7.2"
+from: "jboss-webserver-5/webserver57-openjdk11-tomcat9-rhel8:5.7.2"
 labels:
     - name: "com.redhat.component"
       value: "jboss-webserver-57-openjdk11-rhel8-openshift-container"
@@ -27,41 +27,8 @@ modules:
                   ref: main
           - path: custom-modules
       install:
-          - name: jboss.container.maven.35.bash
-            version: "3.5"
           - name: jboss.container.java.rm-openjdk
-          - name: dynamic-resources
-          - name: s2i-common
-          - name: os-jws-s2i
-            version: "3.0"
-          - name: jws8-conffiles
-            version: "1.0"
-          - name: rm-manager
-            version: "1.0"
-          - name: os-jws-deployments
-            version: "3.0"
-          - name: os-jws-hello
-            version: "3.0"
-          - name: jboss.container.jolokia.bash
-          - name: os-jws-jolokia
-            version: "3.0"
-          - name: jws5-logging
-            version: "1.0"
-          - name: jboss.container.java.jvm.bash
-          - name: os-jws-launch
-            version: "3.0"
-          - name: os-jws-https
-            version: "3.0"
-          - name: os-jws-rm-root
-            version: "3.0"
-          - name: os-jws-rm-defaults
-            version: "3.0"
-          - name: os-jws-chmod
-            version: "3.0"
-          - name: openshift-passwd
-          - name: jboss.container.util.logging.bash
-          - name: os-eap-python
-            version: "3.6"
+
 packages:
       content_sets_file: content_sets_rhel8_jdk11.yml
       install:

diff --git a/tomcat9/jdk8-overrides.yaml b/tomcat9/jdk8-overrides.yaml
@@ -16,41 +16,8 @@ modules:
                   ref: main
           - path: custom-modules
       install:
-          - name: jboss.container.maven.35.bash
-            version: "3.5"
-          - name: dynamic-resources
-          - name: s2i-common
           - name: java-alternatives
-          - name: os-jws-s2i
-            version: "3.0"
-          - name: jws8-conffiles
-            version: "1.0"
-          - name: rm-manager
-            version: "1.0"
-          - name: os-jws-deployments
-            version: "3.0"
-          - name: os-jws-hello
-            version: "3.0"
-          - name: jboss.container.jolokia.bash
-          - name: os-jws-jolokia
-            version: "3.0"
-          - name: jws5-logging
-            version: "1.0"
-          - name: jboss.container.java.jvm.bash
-          - name: os-jws-launch
-            version: "3.0"
-          - name: os-jws-https
-            version: "3.0"
-          - name: os-jws-rm-root
-            version: "3.0"
-          - name: os-jws-rm-defaults
-            version: "3.0"
-          - name: os-jws-chmod
-            version: "3.0"
-          - name: openshift-passwd
-          - name: jboss.container.util.logging.bash
-          - name: os-eap-python
-            version: "3.6"
+
 osbs:
       repository:
             name: containers/jboss-webserver-openjdk8-tomcat9