Skip to content

Commit fe68b7d

Browse files
bekionelbekionel
committed
Updates for 6.1.0
Signed-off-by: Sokratis Zappis <[email protected]>
1 parent b0a93c4 commit fe68b7d

9 files changed

+129
-189
lines changed

‎templates/jws60-openjdk17-tomcat10-ubi8-image-stream.json‎

Lines changed: 0 additions & 132 deletions
This file was deleted.

‎templates/jws60-openjdk17-tomcat10-ubi8-basic-s2i.json‎ renamed to ‎templates/jws61-openjdk17-tomcat10-ubi8-basic-s2i.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
"iconClass": "icon-rh-tomcat",
77
"openshift.io/provider-display-name": "Red Hat, Inc.",
88
"tags": "tomcat,tomcat10,java,jboss",
9-
"version": "6.0",
10-
"openshift.io/display-name": "JBoss Web Server 6.0 Apache Tomcat 10 OpenJDK17 on UBI8 (no https)",
9+
"version": "6.1",
10+
"openshift.io/display-name": "JBoss Web Server 6.1 Apache Tomcat 10 OpenJDK17 on UBI8 (no https)",
1111
"description": "An example JBoss Web Server application. For more information about using this template, see https://github.com/jboss-openshift/application-templates.",
12-
"template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 6.0 Apache Tomcat 10 based application, including a build configuration, and an application deployment configuration.",
12+
"template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 6.1 Apache Tomcat 10 based application, including a build configuration, and an application deployment configuration.",
1313
"template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/",
1414
"template.openshift.io/support-url": "https://access.redhat.com"
1515
},
16-
"name": "jws60-openjdk17-tomcat10-ubi8-basic-s2i"
16+
"name": "jws61-openjdk17-tomcat10-ubi8-basic-s2i"
1717
},
1818
"labels": {
19-
"template": "jws60-openjdk17-tomcat10-ubi8-basic-s2i",
20-
"jws60jdk17ubi8": "6.0.3"
19+
"template": "jws61-openjdk17-tomcat10-ubi8-basic-s2i",
20+
"jws61jdk17ubi8": "6.1.0"
2121
},
2222
"message": "A new JWS application for Apache Tomcat 10 has been created in your project.",
2323
"parameters": [
@@ -183,7 +183,7 @@
183183
"from": {
184184
"kind": "ImageStreamTag",
185185
"namespace": "${IMAGE_STREAM_NAMESPACE}",
186-
"name": "jboss-webserver60-openjdk17-tomcat10-openshift-ubi8:6.0.3"
186+
"name": "jboss-webserver61-openjdk17-tomcat10-openshift-ubi8:6.1.0"
187187
}
188188
}
189189
},

‎templates/jws60-openjdk17-tomcat10-ubi8-https-s2i.json‎ renamed to ‎templates/jws61-openjdk17-tomcat10-ubi8-https-s2i.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
"iconClass": "icon-rh-tomcat",
77
"openshift.io/provider-display-name": "Red Hat, Inc.",
88
"tags": "tomcat,tomcat10,java,jboss,hidden",
9-
"version": "6.0",
10-
"openshift.io/display-name": "JBoss Web Server 6.0 Apache Tomcat 10 OpenJDK17 on UBI8 (with https)",
9+
"version": "6.1",
10+
"openshift.io/display-name": "JBoss Web Server 6.1 Apache Tomcat 10 OpenJDK17 on UBI8 (with https)",
1111
"description": "An example JBoss Web Server application. For more information about using this template, see https://github.com/jboss-openshift/application-templates.",
12-
"template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 6.0 Apache Tomcat 10 based application, including a build configuration, application deployment configuration, and secure communication using https.",
12+
"template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 6.1 Apache Tomcat 10 based application, including a build configuration, application deployment configuration, and secure communication using https.",
1313
"template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/",
1414
"template.openshift.io/support-url": "https://access.redhat.com"
1515

1616
},
17-
"name": "jws60-openjdk17-tomcat10-ubi8-https-s2i"
17+
"name": "jws61-openjdk17-tomcat10-ubi8-https-s2i"
1818
},
1919
"labels": {
20-
"template": "jws60-openjdk17-tomcat10-ubi8-https-s2i",
21-
"jws60jdk17ubi8": "6.0.3"
20+
"template": "jws61-openjdk17-tomcat10-ubi8-https-s2i",
21+
"jws61jdk17ubi8": "6.1.0"
2222
},
2323
"message": "A new JWS application for Apache Tomcat 10 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.",
2424
"parameters": [
@@ -266,7 +266,7 @@
266266
"from": {
267267
"kind": "ImageStreamTag",
268268
"namespace": "${IMAGE_STREAM_NAMESPACE}",
269-
"name": "jboss-webserver60-openjdk17-tomcat10-openshift-ubi8:6.0.3"
269+
"name": "jboss-webserver61-openjdk17-tomcat10-openshift-ubi8:6.1.0"
270270
}
271271
}
272272
},

‎templates/jws61-openjdk17-tomcat10-ubi8-image-stream.json‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
{
2+
"kind": "List",
3+
"apiVersion": "v1",
4+
"metadata": {
5+
"name": "webserver61-openjdk17-tomcat10-ubi8-image-stream",
6+
"annotations": {
7+
"description": "ImageStream definition for Red Hat JBoss Web Server 6.1 Apache Tomcat 10 OpenJDK17 on UBI8.",
8+
"openshift.io/provider-display-name": "Red Hat, Inc."
9+
}
10+
},
11+
"items": [
12+
{
13+
"kind": "ImageStream",
14+
"apiVersion": "image.openshift.io/v1",
15+
"metadata": {
16+
"name": "jboss-webserver61-openjdk17-tomcat10-openshift-ubi8",
17+
"annotations": {
18+
"openshift.io/display-name": "JBoss Web Server 6.1 Apache Tomcat 10 OpenJDK17 on UBI8",
19+
"openshift.io/provider-display-name": "Red Hat, Inc.",
20+
"version": "6.1"
21+
}
22+
},
23+
"labels": {
24+
"jws61jdk17ubi8": "6.1.0"
25+
},
26+
"spec": {
27+
"tags": [
28+
{
29+
"name": "latest",
30+
"annotations": {
31+
"description": "JBoss Web Server 6.1 Apache Tomcat 10 OpenJDK17 on UBI8 S2I images.",
32+
"iconClass": "icon-rh-tomcat",
33+
"tags": "builder,tomcat,tomcat10,java,jboss,hidden",
34+
"supports": "tomcat10:6.1,tomcat:10,java:17",
35+
"sampleRepo": "https://github.com/web-servers/tomcat-websocket-chat-quickstart.git",
36+
"sampleContextDir": "tomcat-websocket-chat",
37+
"version": "latest",
38+
"openshift.io/display-name": "JBoss Web Server 6.1 Apache Tomcat 10 OpenJDK17 on UBI8"
39+
},
40+
"referencePolicy": {
41+
"type": "Local"
42+
},
43+
"from": {
44+
"kind": "DockerImage",
45+
"name": "registry.redhat.io/jboss-webserver-6/jws61-openjdk17-openshift-rhel8:latest"
46+
}
47+
},
48+
{
49+
"name": "6.1.0",
50+
"annotations": {
51+
"description": "JBoss Web Server 6.1 Apache Tomcat 10 OpenJDK17 on UBI8 S2I images.",
52+
"iconClass": "icon-rh-tomcat",
53+
"tags": "builder,tomcat,tomcat10,java,jboss,hidden",
54+
"supports": "tomcat10:6.1,tomcat:10,java:17",
55+
"sampleRepo": "https://github.com/web-servers/tomcat-websocket-chat-quickstart.git",
56+
"sampleContextDir": "tomcat-websocket-chat",
57+
"version": "6.1.0",
58+
"openshift.io/display-name": "JBoss Web Server 6.1 Apache Tomcat 10 OpenJDK17 on UBI8"
59+
},
60+
"referencePolicy": {
61+
"type": "Local"
62+
},
63+
"from": {
64+
"kind": "DockerImage",
65+
"name": "registry.redhat.io/jboss-webserver-6/jws61-openjdk17-openshift-rhel8:6.1.0"
66+
}
67+
}
68+
]
69+
}
70+
}
71+
]
72+
}

‎templates/jws60-openjdk21-tomcat10-ubi8-basic-s2i.json‎ renamed to ‎templates/jws61-openjdk21-tomcat10-ubi8-basic-s2i.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
"iconClass": "icon-rh-tomcat",
77
"openshift.io/provider-display-name": "Red Hat, Inc.",
88
"tags": "tomcat,tomcat10,java,jboss",
9-
"version": "6.0",
10-
"openshift.io/display-name": "JBoss Web Server 6.0 Apache Tomcat 10 OpenJDK21 on UBI8 (no https)",
9+
"version": "6.1",
10+
"openshift.io/display-name": "JBoss Web Server 6.1 Apache Tomcat 10 OpenJDK21 on UBI8 (no https)",
1111
"description": "An example JBoss Web Server application. For more information about using this template, see https://github.com/jboss-openshift/application-templates.",
12-
"template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 6.0 Apache Tomcat 10 based application, including a build configuration, and an application deployment configuration.",
12+
"template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 6.1 Apache Tomcat 10 based application, including a build configuration, and an application deployment configuration.",
1313
"template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/",
1414
"template.openshift.io/support-url": "https://access.redhat.com"
1515
},
16-
"name": "jws60-openjdk21-tomcat10-ubi8-basic-s2i"
16+
"name": "jws61-openjdk21-tomcat10-ubi8-basic-s2i"
1717
},
1818
"labels": {
19-
"template": "jws60-openjdk21-tomcat10-ubi8-basic-s2i",
20-
"jws60jdk21ubi8": "6.0.3"
19+
"template": "jws61-openjdk21-tomcat10-ubi8-basic-s2i",
20+
"jws61jdk21ubi8": "6.1.0"
2121
},
2222
"message": "A new JWS application for Apache Tomcat 10 has been created in your project.",
2323
"parameters": [
@@ -183,7 +183,7 @@
183183
"from": {
184184
"kind": "ImageStreamTag",
185185
"namespace": "${IMAGE_STREAM_NAMESPACE}",
186-
"name": "jboss-webserver60-openjdk21-tomcat10-openshift-ubi8:6.0.3"
186+
"name": "jboss-webserver61-openjdk21-tomcat10-openshift-ubi8:6.1.0"
187187
}
188188
}
189189
},

‎templates/jws60-openjdk21-tomcat10-ubi8-https-s2i.json‎ renamed to ‎templates/jws61-openjdk21-tomcat10-ubi8-https-s2i.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
"iconClass": "icon-rh-tomcat",
77
"openshift.io/provider-display-name": "Red Hat, Inc.",
88
"tags": "tomcat,tomcat10,java,jboss,hidden",
9-
"version": "6.0",
10-
"openshift.io/display-name": "JBoss Web Server 6.0 Apache Tomcat 10 OpenJDK21 on UBI8 (with https)",
9+
"version": "6.1",
10+
"openshift.io/display-name": "JBoss Web Server 6.1 Apache Tomcat 10 OpenJDK21 on UBI8 (with https)",
1111
"description": "An example JBoss Web Server application. For more information about using this template, see https://github.com/jboss-openshift/application-templates.",
12-
"template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 6.0 Apache Tomcat 10 based application, including a build configuration, application deployment configuration, and secure communication using https.",
12+
"template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 6.1 Apache Tomcat 10 based application, including a build configuration, application deployment configuration, and secure communication using https.",
1313
"template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/",
1414
"template.openshift.io/support-url": "https://access.redhat.com"
1515

1616
},
17-
"name": "jws60-openjdk21-tomcat10-ubi8-https-s2i"
17+
"name": "jws61-openjdk21-tomcat10-ubi8-https-s2i"
1818
},
1919
"labels": {
20-
"template": "jws60-openjdk21-tomcat10-ubi8-https-s2i",
21-
"jws60jdk21ubi8": "6.0.3"
20+
"template": "jws61-openjdk21-tomcat10-ubi8-https-s2i",
21+
"jws61jdk21ubi8": "6.1.0"
2222
},
2323
"message": "A new JWS application for Apache Tomcat 10 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.",
2424
"parameters": [
@@ -266,7 +266,7 @@
266266
"from": {
267267
"kind": "ImageStreamTag",
268268
"namespace": "${IMAGE_STREAM_NAMESPACE}",
269-
"name": "jboss-webserver60-openjdk21-tomcat10-openshift-ubi8:6.0.3"
269+
"name": "jboss-webserver61-openjdk21-tomcat10-openshift-ubi8:6.1.0"
270270
}
271271
}
272272
},

0 commit comments

Comments
 (0)