diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-06-22 12:03:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-22 12:03:14 -0400 |
| commit | 6c0760068922d06ca161d833c1e9dc442ab8960e (patch) | |
| tree | 034db0134acabc525164c2aa23114a3c06965836 /roles/openshift_examples/files/examples/v3.6/image-streams/image-streams-rhel7.json | |
| parent | e18bd4fbe1b8035e87140390c0c27c73282b5ea3 (diff) | |
| parent | aa6b6a0912b7404288f907baf5c72d481ef1b902 (diff) | |
| download | openshift-6c0760068922d06ca161d833c1e9dc442ab8960e.tar.gz openshift-6c0760068922d06ca161d833c1e9dc442ab8960e.tar.bz2 openshift-6c0760068922d06ca161d833c1e9dc442ab8960e.tar.xz openshift-6c0760068922d06ca161d833c1e9dc442ab8960e.zip | |
Merge pull request #4528 from mtnbikenc/update-templates
Update template examples for 3.6
Diffstat (limited to 'roles/openshift_examples/files/examples/v3.6/image-streams/image-streams-rhel7.json')
| -rw-r--r-- | roles/openshift_examples/files/examples/v3.6/image-streams/image-streams-rhel7.json | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/roles/openshift_examples/files/examples/v3.6/image-streams/image-streams-rhel7.json b/roles/openshift_examples/files/examples/v3.6/image-streams/image-streams-rhel7.json index b65f0a5e3..abdae01e3 100644 --- a/roles/openshift_examples/files/examples/v3.6/image-streams/image-streams-rhel7.json +++ b/roles/openshift_examples/files/examples/v3.6/image-streams/image-streams-rhel7.json @@ -7,6 +7,51 @@ "kind": "ImageStream", "apiVersion": "v1", "metadata": { + "name": "httpd", + "annotations": { + "openshift.io/display-name": "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.", + "iconClass": "icon-apache", + "tags": "builder,httpd", + "supports":"httpd", + "sampleRepo": "https://github.com/openshift/httpd-ex.git" + }, + "from": { + "kind": "ImageStreamTag", + "name": "2.4" + } + }, + { + "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.", + "iconClass": "icon-apache", + "tags": "builder,httpd", + "supports":"httpd", + "version": "2.4", + "sampleRepo": "https://github.com/openshift/httpd-ex.git" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/rhscl/httpd-24-rhel7" + } + } + ] + } + }, + { + "kind": "ImageStream", + "apiVersion": "v1", + "metadata": { "name": "ruby", "annotations": { "openshift.io/display-name": "Ruby" |