Skip to content

Commit

Permalink
Update to 5.3.2, update image locations in image streams, bump tag
Browse files Browse the repository at this point in the history
  • Loading branch information
@bekionel
bekionel committed Jul 28, 2020
1 parent f9576e8 commit d3ef45b
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion templates/jws53-openj9-tomcat9-rhel7-basic-s2i.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"labels": {
"template": "jws53-openj9-tomcat9-rhel7-basic-s2i",
"jws53openj9el7": "1.1"
"jws53openj9el7": "1.2"
},
"message": "A new JWS application for Apache Tomcat 9 has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}.",
"parameters": [
Expand Down
2 changes: 1 addition & 1 deletion templates/jws53-openj9-tomcat9-rhel7-https-s2i.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"labels": {
"template": "jws53-openj9-tomcat9-rhel7-https-s2i",
"jws53openj9el7": "1.1"
"jws53openj9el7": "1.2"
},
"message": "A new JWS application for Apache Tomcat 9 has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.",
"parameters": [
Expand Down
12 changes: 6 additions & 6 deletions templates/jws53-openj9-tomcat9-rhel7-image-stream.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
}
},
"labels": {
"jws53openj9el7": "1.1"
"jws53openj9el7": "1.2"
},
"spec": {
"tags": [
Expand All @@ -42,7 +42,7 @@
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/jboss-webserver-5/webserver53-openj9-tomcat9-rhel7-openshift:latest"
"name": "registry.redhat.io/jboss-webserver-5/webserver53-openj9-tomcat9-openshift-rhel7:latest"
},
"importPolicy": {
"insecure": true
Expand All @@ -51,21 +51,21 @@
{
"name": "1.0",
"annotations": {
"description": "JBoss Web Server 5.0 Apache Tomcat 9 S2I images.",
"description": "JBoss Web Server 5.3 Apache Tomcat 9 S2I images.",
"iconClass": "icon-rh-tomcat",
"tags": "builder,tomcat,tomcat9,java,jboss,hidden",
"supports": "tomcat9:5.0,tomcat:9,java:8",
"supports": "tomcat9:5.3,tomcat:9,java:11",
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
"sampleContextDir": "tomcat-websocket-chat",
"version": "1.0",
"openshift.io/display-name": "JBoss Web Server 5.0 Apache Tomcat 9"
"openshift.io/display-name": "JBoss Web Server 5.3 Apache Tomcat 9"
},
"referencePolicy": {
"type": "Local"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/jboss-webserver-5/webserver53-openj9-tomcat9-rhel7-openshift:1.0"
"name": "registry.redhat.io/jboss-webserver-5/webserver53-openj9-tomcat9-openshift-rhel7:1.0"
},
"importPolicy": {
"insecure": true
Expand Down
2 changes: 1 addition & 1 deletion templates/jws53-openj9-tomcat9-rhel7-mongodb-persistent-s2i.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"message": "A new persistent JWS application for Apache Tomcat 9 (using MongoDB) has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. For accessing the MongoDB database \"${DB_DATABASE}\" use the credentials ${DB_USERNAME}/${DB_PASSWORD} (Admin password is \"${DB_ADMIN_PASSWORD}\"). Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.",
"labels": {
"template": "jws53-openj9-tomcat9-rhel7-mongodb-persistent-s2i",
"jws53openj9el7": "1.1"
"jws53openj9el7": "1.2"
},
"parameters": [
{
Expand Down
2 changes: 1 addition & 1 deletion templates/jws53-openj9-tomcat9-rhel7-mongodb-s2i.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"labels": {
"template": "jws53-openj9-tomcat9-rhel7-mongodb-s2i",
"jws53openj9el7": "1.1"
"jws53openj9el7": "1.2"
},
"message": "A new JWS application for Apache Tomcat 9 (using MongoDB) has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. For accessing the MongoDB database \"${DB_DATABASE}\" use the credentials ${DB_USERNAME}/${DB_PASSWORD} (Admin password is \"${DB_ADMIN_PASSWORD}\"). Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.",
"parameters": [
Expand Down
2 changes: 1 addition & 1 deletion templates/jws53-openj9-tomcat9-rhel7-mysql-persistent-s2i.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"labels": {
"template": "jws53-openj9-tomcat9-rhel7-mysql-persistent-s2i",
"jws53openj9el7": "1.1"
"jws53openj9el7": "1.2"
},
"message": "A new persistent JWS application for Apache Tomcat 9 (using MySQL) has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. For accessing the MySQL database \"${DB_DATABASE}\" use the credentials ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.",
"parameters": [
Expand Down
2 changes: 1 addition & 1 deletion templates/jws53-openj9-tomcat9-rhel7-mysql-s2i.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"labels": {
"template": "jws53-openj9-tomcat9-rhel7-mysql-s2i",
"jws53openj9el7": "1.1"
"jws53openj9el7": "1.2"
},
"message": "A new JWS application for Apache Tomcat 9 (using MySQL) has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. For accessing the MySQL database \"${DB_DATABASE}\" use the credentials ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.",
"parameters": [
Expand Down
2 changes: 1 addition & 1 deletion templates/jws53-openj9-tomcat9-rhel7-postgresql-persistent-s2i.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"labels": {
"template": "jws53-openj9-tomcat9-rhel7-postgresql-persistent-s2i",
"jws53openj9el7": "1.1"
"jws53openj9el7": "1.2"
},
"message": "A new persistent JWS application for Apache Tomcat 9 (using PostgreSQL) has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. For accessing the PostgreSQL database \"${DB_DATABASE}\" use the credentials ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.",
"parameters": [
Expand Down
2 changes: 1 addition & 1 deletion templates/jws53-openj9-tomcat9-rhel7-postgresql-s2i.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"labels": {
"template": "jws53-openj9-tomcat9-rhel7-postgresql-s2i",
"jws53openj9el7": "1.1"
"jws53openj9el7": "1.2"
},
"message": "A new JWS application for Apache Tomcat 9 (using PostgreSQL) has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. For accessing the PostgreSQL database \"${DB_DATABASE}\" use the credentials ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.",
"parameters": [
Expand Down
2 changes: 1 addition & 1 deletion tomcat9/image.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ schema_version: 1
name: "jboss-webserver-5/webserver53-openj9-tomcat9-rhel7-openshift"
description: "Red Hat JBoss Web Server 5.3 - Tomcat 9 OpenShift container image"
version: "1.0"
from: "jboss-webserver-5/webserver53-openj9-tomcat9-rhel7:5.3.0"
from: "jboss-webserver-5/webserver53-openj9-tomcat9-rhel7:5.3.2"
labels:
- name: "com.redhat.component"
value: "jboss-webserver-5-webserver53-openj9-tomcat9-rhel7-openshift-container"
Expand Down

0 comments on commit d3ef45b

Please sign in to comment.