Skip to content

Commit d5ea59b

Browse files
coreydaleycoreydaley
committed
update Apache image stream naming, Apache QuickStart, and add Ruby 2.4 image stream
1 parent 72bd5ba commit d5ea59b

File tree

6 files changed

+147
-50
lines changed

6 files changed

+147
-50
lines changed

‎examples/image-streams/image-streams-centos7.json

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
"metadata": {
1010
"name": "httpd",
1111
"annotations": {
12-
"openshift.io/display-name": "Httpd"
12+
"openshift.io/display-name": "Apache HTTP Server (httpd)"
1313
}
1414
},
1515
"spec": {
1616
"tags": [
1717
{
1818
"name": "latest",
1919
"annotations": {
20-
"openshift.io/display-name": "Httpd (Latest)",
21-
"description": "Build and serve static content via Httpd on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Httpd available on OpenShift, including major versions updates.",
20+
"openshift.io/display-name": "Apache HTTP Server (Latest)",
21+
"description": "Build and serve static content via Apache HTTP Server (httpd) on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Httpd available on OpenShift, including major versions updates.",
2222
"iconClass": "icon-apache",
2323
"tags": "builder,httpd",
2424
"supports":"httpd",
@@ -32,8 +32,8 @@
3232
{
3333
"name": "2.4",
3434
"annotations": {
35-
"openshift.io/display-name": "Httpd 2.4",
36-
"description": "Build and serve static content via Httpd on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.",
35+
"openshift.io/display-name": "Apache HTTP Server 2.4",
36+
"description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.",
3737
"iconClass": "icon-apache",
3838
"tags": "builder,httpd",
3939
"supports":"httpd",
@@ -71,7 +71,7 @@
7171
},
7272
"from": {
7373
"kind": "ImageStreamTag",
74-
"name": "2.3"
74+
"name": "2.4"
7575
}
7676
},
7777
{
@@ -121,6 +121,22 @@
121121
"kind": "DockerImage",
122122
"name": "centos/ruby-23-centos7:latest"
123123
}
124+
},
125+
{
126+
"name": "2.4",
127+
"annotations": {
128+
"openshift.io/display-name": "Ruby 2.4",
129+
"description": "Build and run Ruby 2.4 applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/blob/master/2.4/README.md.",
130+
"iconClass": "icon-ruby",
131+
"tags": "builder,ruby",
132+
"supports": "ruby:2.4,ruby",
133+
"version": "2.4",
134+
"sampleRepo": "https://github.com/openshift/ruby-ex.git"
135+
},
136+
"from": {
137+
"kind": "DockerImage",
138+
"name": "centos/ruby-24-centos7:latest"
139+
}
124140
}
125141
]
126142
}

‎examples/image-streams/image-streams-rhel7.json

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
"metadata": {
1010
"name": "httpd",
1111
"annotations": {
12-
"openshift.io/display-name": "Httpd"
12+
"openshift.io/display-name": "Apache HTTP Server (httpd)"
1313
}
1414
},
1515
"spec": {
1616
"tags": [
1717
{
1818
"name": "latest",
1919
"annotations": {
20-
"openshift.io/display-name": "Httpd (Latest)",
21-
"description": "Build and serve static content via Httpd on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Httpd available on OpenShift, including major versions updates.",
20+
"openshift.io/display-name": "Apache HTTP Server (Latest)",
21+
"description": "Build and serve static content via Apache HTTP Server (httpd) on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Httpd available on OpenShift, including major versions updates.",
2222
"iconClass": "icon-apache",
2323
"tags": "builder,httpd",
2424
"supports":"httpd",
@@ -32,8 +32,8 @@
3232
{
3333
"name": "2.4",
3434
"annotations": {
35-
"openshift.io/display-name": "Httpd 2.4",
36-
"description": "Build and serve static content via Httpd on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.",
35+
"openshift.io/display-name": "Apache HTTP Server 2.4",
36+
"description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.",
3737
"iconClass": "icon-apache",
3838
"tags": "builder,httpd",
3939
"supports":"httpd",
@@ -71,7 +71,7 @@
7171
},
7272
"from": {
7373
"kind": "ImageStreamTag",
74-
"name": "2.3"
74+
"name": "2.4"
7575
}
7676
},
7777
{
@@ -121,6 +121,22 @@
121121
"kind": "DockerImage",
122122
"name": "registry.access.redhat.com/rhscl/ruby-23-rhel7:latest"
123123
}
124+
},
125+
{
126+
"name": "2.4",
127+
"annotations": {
128+
"openshift.io/display-name": "Ruby 2.4",
129+
"description": "Build and run Ruby 2.4 applications on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/blob/master/2.4/README.md.",
130+
"iconClass": "icon-ruby",
131+
"tags": "builder,ruby",
132+
"supports": "ruby:2.4,ruby",
133+
"version": "2.4",
134+
"sampleRepo": "https://github.com/openshift/ruby-ex.git"
135+
},
136+
"from": {
137+
"kind": "DockerImage",
138+
"name": "registry.access.redhat.com/rhscl/ruby-24-rhel7:latest"
139+
}
124140
}
125141
]
126142
}

‎examples/quickstarts/httpd.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"metadata": {
55
"name": "httpd-example",
66
"annotations": {
7-
"openshift.io/display-name": "Httpd",
8-
"description": "An example Httpd application that serves static content. For more information about using this template, including OpenShift considerations, see https://github.com/openshift/httpd-ex/blob/master/README.md.",
7+
"openshift.io/display-name": "Apache HTTP Server",
8+
"description": "An example Apache HTTP Server (httpd) application that serves static content. For more information about using this template, including OpenShift considerations, see https://github.com/openshift/httpd-ex/blob/master/README.md.",
99
"tags": "quickstart,httpd",
1010
"iconClass": "icon-apache",
11-
"template.openshift.io/long-description": "This template defines resources needed to develop a static application served by httpd, including a build configuration and application deployment configuration.",
11+
"template.openshift.io/long-description": "This template defines resources needed to develop a static application served by Apache HTTP Server (httpd), including a build configuration and application deployment configuration.",
1212
"template.openshift.io/provider-display-name": "Red Hat, Inc.",
1313
"template.openshift.io/documentation-url": "https://github.com/openshift/httpd-ex",
1414
"template.openshift.io/support-url": "https://access.redhat.com"

‎pkg/oc/bootstrap/bindata.go

Lines changed: 47 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)