- tweaks to make things friendlier for the global template library.

sheaphillips · sheaphillips · commit 84d6ec8e9eea · 2017-07-14T15:12:53.000-07:00
diff --git a/openshift/s2i-nginx-builder-bc.json b/openshift/s2i-nginx-builder-bc.json
@@ -10,7 +10,7 @@
                 "name": "base-centos7",
                 "creationTimestamp": null,
                 "labels": {
-                    "build": "s2i-nginx"
+                    "build": "bcgov-s2i-nginx"
                 },
                 "annotations": {
                     "openshift.io/generated-by": "OpenShiftNewBuild"
@@ -40,10 +40,10 @@
             "kind": "ImageStream",
             "apiVersion": "v1",
             "metadata": {
-                "name": "s2i-nginx",
+                "name": "bcgov-s2i-nginx",
                 "creationTimestamp": null,
                 "labels": {
-                    "build": "s2i-nginx"
+                    "build": "bcgov-s2i-nginx"
                 },
                 "annotations": {
                     "openshift.io/generated-by": "OpenShiftNewBuild"
@@ -58,10 +58,10 @@
             "kind": "BuildConfig",
             "apiVersion": "v1",
             "metadata": {
-                "name": "s2i-nginx",
+                "name": "bcgov-s2i-nginx",
                 "creationTimestamp": null,
                 "labels": {
-                    "build": "s2i-nginx"
+                    "build": "bcgov-s2i-nginx"
                 },
                 "annotations": {
                     "openshift.io/generated-by": "OpenShiftNewBuild"
@@ -95,7 +95,7 @@
                 "output": {
                     "to": {
                         "kind": "ImageStreamTag",
-                        "name": "s2i-nginx:latest"
+                        "name": "bcgov-s2i-nginx:latest"
                     }
                 },
                 "resources": {},
diff --git a/openshift/templates/nginx-build-template.json b/openshift/templates/nginx-build-template.json
@@ -96,7 +96,7 @@
       "displayName": "Builder ImageStreamTag",
       "description": "The image stream tag (e.g. rproxy:latest) of the S2I image that should be used to build the application.",
       "required": true,
-      "value": "s2i-nginx:latest"
+      "value": "bcgov-s2i-nginx:latest"
     },
     {
       "name": "BUILDER_IMAGESTREAM_NAMESPACE",

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@`
`96`	`96`	`"displayName": "Builder ImageStreamTag",`
`97`	`97`	`"description": "The image stream tag (e.g. rproxy:latest) of the S2I image that should be used to build the application.",`
`98`	`98`	`"required": true,`
`99`		`- "value": "s2i-nginx:latest"`
	`99`	`+ "value": "bcgov-s2i-nginx:latest"`
`100`	`100`	`},`
`101`	`101`	`{`
`102`	`102`	`"name": "BUILDER_IMAGESTREAM_NAMESPACE",`