Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update Apache image stream naming, Apache QuickStart, and add Ruby 2.… #16214

Merged
merged 1 commit into from
Sep 9, 2017
Merged

update Apache image stream naming, Apache QuickStart, and add Ruby 2.… #16214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 22 additions & 6 deletions examples/image-streams/image-streams-centos7.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
"metadata": {
"name": "httpd",
"annotations": {
"openshift.io/display-name": "Httpd"
"openshift.io/display-name": "Apache HTTP Server (httpd)"
}
},
"spec": {
"tags": [
{
"name": "latest",
"annotations": {
"openshift.io/display-name": "Httpd (Latest)",
"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.",
"openshift.io/display-name": "Apache HTTP Server (Latest)",
"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.",
"iconClass": "icon-apache",
"tags": "builder,httpd",
"supports":"httpd",
Expand All @@ -32,8 +32,8 @@
{
"name": "2.4",
"annotations": {
"openshift.io/display-name": "Httpd 2.4",
"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.",
"openshift.io/display-name": "Apache HTTP Server 2.4",
"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.",
"iconClass": "icon-apache",
"tags": "builder,httpd",
"supports":"httpd",
Expand Down Expand Up @@ -71,7 +71,7 @@
},
"from": {
"kind": "ImageStreamTag",
"name": "2.3"
"name": "2.4"
}
},
{
Expand Down Expand Up @@ -121,6 +121,22 @@
"kind": "DockerImage",
"name": "centos/ruby-23-centos7:latest"
}
},
{
"name": "2.4",
"annotations": {
"openshift.io/display-name": "Ruby 2.4",
"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.",
"iconClass": "icon-ruby",
"tags": "builder,ruby",
"supports": "ruby:2.4,ruby",
"version": "2.4",
"sampleRepo": "https://github.com/openshift/ruby-ex.git"
},
"from": {
"kind": "DockerImage",
"name": "centos/ruby-24-centos7:latest"
}
}
]
}
Expand Down
28 changes: 22 additions & 6 deletions examples/image-streams/image-streams-rhel7.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
"metadata": {
"name": "httpd",
"annotations": {
"openshift.io/display-name": "Httpd"
"openshift.io/display-name": "Apache HTTP Server (httpd)"
}
},
"spec": {
"tags": [
{
"name": "latest",
"annotations": {
"openshift.io/display-name": "Httpd (Latest)",
"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.",
"openshift.io/display-name": "Apache HTTP Server (Latest)",
"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.",
"iconClass": "icon-apache",
"tags": "builder,httpd",
"supports":"httpd",
Expand All @@ -32,8 +32,8 @@
{
"name": "2.4",
"annotations": {
"openshift.io/display-name": "Httpd 2.4",
"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.",
"openshift.io/display-name": "Apache HTTP Server 2.4",
"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.",
"iconClass": "icon-apache",
"tags": "builder,httpd",
"supports":"httpd",
Expand Down Expand Up @@ -71,7 +71,7 @@
},
"from": {
"kind": "ImageStreamTag",
"name": "2.3"
"name": "2.4"
}
},
{
Expand Down Expand Up @@ -121,6 +121,22 @@
"kind": "DockerImage",
"name": "registry.access.redhat.com/rhscl/ruby-23-rhel7:latest"
}
},
{
"name": "2.4",
"annotations": {
"openshift.io/display-name": "Ruby 2.4",
"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.",
"iconClass": "icon-ruby",
"tags": "builder,ruby",
"supports": "ruby:2.4,ruby",
"version": "2.4",
"sampleRepo": "https://github.com/openshift/ruby-ex.git"
},
"from": {
"kind": "DockerImage",
"name": "registry.access.redhat.com/rhscl/ruby-24-rhel7:latest"
}
}
]
}
Expand Down
6 changes: 3 additions & 3 deletions examples/quickstarts/httpd.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"metadata": {
"name": "httpd-example",
"annotations": {
"openshift.io/display-name": "Httpd",
"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.",
"openshift.io/display-name": "Apache HTTP Server",
"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.",
"tags": "quickstart,httpd",
"iconClass": "icon-apache",
"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.",
"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.",
"template.openshift.io/provider-display-name": "Red Hat, Inc.",
"template.openshift.io/documentation-url": "https://github.com/openshift/httpd-ex",
"template.openshift.io/support-url": "https://access.redhat.com"
Expand Down
62 changes: 47 additions & 15 deletions pkg/oc/bootstrap/bindata.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.