diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-11-14 16:13:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-14 16:13:23 -0500 |
| commit | b6fa0f86de23374e8f060e23b2ded0ddbd3eaa1a (patch) | |
| tree | deb253fe00fb35f74bacbf9d946ad6c19784f024 /roles/openshift_examples | |
| parent | ae34dc20b9e797d6b73576b30b73931beca693ec (diff) | |
| parent | 239c40d5381f9d2eca7d2aa1de3141d27642b0ac (diff) | |
| download | openshift-b6fa0f86de23374e8f060e23b2ded0ddbd3eaa1a.tar.gz openshift-b6fa0f86de23374e8f060e23b2ded0ddbd3eaa1a.tar.bz2 openshift-b6fa0f86de23374e8f060e23b2ded0ddbd3eaa1a.tar.xz openshift-b6fa0f86de23374e8f060e23b2ded0ddbd3eaa1a.zip | |
Merge pull request #2802 from sdodson/image-stream-sync
Sync latest image stream and templates
Diffstat (limited to 'roles/openshift_examples')
| -rw-r--r-- | roles/openshift_examples/files/examples/v1.4/image-streams/dotnet_imagestreams.json | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/roles/openshift_examples/files/examples/v1.4/image-streams/dotnet_imagestreams.json b/roles/openshift_examples/files/examples/v1.4/image-streams/dotnet_imagestreams.json index 00b363c42..a65d35c2e 100644 --- a/roles/openshift_examples/files/examples/v1.4/image-streams/dotnet_imagestreams.json +++ b/roles/openshift_examples/files/examples/v1.4/image-streams/dotnet_imagestreams.json @@ -12,14 +12,18 @@ "kind": "ImageStream", "apiVersion": "v1", "metadata": { - "name": "dotnet" + "name": "dotnet", + "annotations": { + "openshift.io/display-name": ".NET Core" + } }, "spec": { "tags": [ { "name": "latest", "annotations": { - "description": "Build and run .NET Core 1.0 applications", + "openshift.io/display-name": ".NET Core (Latest)", + "description": "Build and run .NET Core applications on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/1.0/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET Core available on OpenShift, including major versions updates.", "iconClass": "icon-dotnet", "tags": "builder,.net,dotnet,dotnetcore", "supports":"dotnet", @@ -34,7 +38,8 @@ { "name": "1.0", "annotations": { - "description": "Build and run .NET Core 1.0 applications", + "openshift.io/display-name": ".NET Core 1.0", + "description": "Build and run .NET Core 1.0 applications on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/1.0/README.md.", "iconClass": "icon-dotnet", "tags": "builder,.net,dotnet,dotnetcore,rh-dotnetcore10", "supports":"dotnet:1.0,dotnet", |