Merge pull request #8892 from gabemontero/fixContainerImageField

OpenShift Bot · OpenShift Bot · commit a64fbd07a3af · 2016-05-16T17:38:23.000-04:00
Merged by openshift-bot
diff --git a/examples/db-templates/mongodb-ephemeral-template.json b/examples/db-templates/mongodb-ephemeral-template.json
@@ -85,7 +85,7 @@
             "containers": [
               {
                 "name": "mongodb",
-                "image": "mongodb",
+                "image": " ",
                 "ports": [
                   {
                     "containerPort": 27017,
diff --git a/examples/db-templates/mongodb-persistent-template.json b/examples/db-templates/mongodb-persistent-template.json
@@ -102,7 +102,7 @@
             "containers": [
               {
                 "name": "mongodb",
-                "image": "mongodb",
+                "image": " ",
                 "ports": [
                   {
                     "containerPort": 27017,
diff --git a/examples/db-templates/mysql-ephemeral-template.json b/examples/db-templates/mysql-ephemeral-template.json
@@ -85,7 +85,7 @@
             "containers": [
               {
                 "name": "mysql",
-                "image": "mysql",
+                "image": " ",
                 "ports": [
                   {
                     "containerPort": 3306,
diff --git a/examples/db-templates/mysql-persistent-template.json b/examples/db-templates/mysql-persistent-template.json
@@ -102,7 +102,7 @@
             "containers": [
               {
                 "name": "mysql",
-                "image": "mysql",
+                "image": " ",
                 "ports": [
                   {
                     "containerPort": 3306,
diff --git a/examples/db-templates/postgresql-ephemeral-template.json b/examples/db-templates/postgresql-ephemeral-template.json
@@ -85,7 +85,7 @@
             "containers": [
               {
                 "name": "postgresql",
-                "image": "postgresql",
+                "image": " ",
                 "ports": [
                   {
                     "containerPort": 5432,
diff --git a/examples/db-templates/postgresql-persistent-template.json b/examples/db-templates/postgresql-persistent-template.json
@@ -102,7 +102,7 @@
             "containers": [
               {
                 "name": "postgresql",
-                "image": "postgresql",
+                "image": " ",
                 "ports": [
                   {
                     "containerPort": 5432,
diff --git a/examples/jenkins-master/jenkins-master-template.json b/examples/jenkins-master/jenkins-master-template.json
@@ -208,7 +208,7 @@
             "containers": [
               {
                 "name": "jenkins",
-                "image": "jenkins-master",
+                "image": " ",
                 "readinessProbe": {
                   "timeoutSeconds": 3,
                   "initialDelaySeconds": 3,
diff --git a/examples/jenkins/application-template.json b/examples/jenkins/application-template.json
@@ -108,7 +108,7 @@
             "containers": [
               {
                 "name": "nodejs-helloworld",
-                "image": "origin-nodejs-sample",
+                "image": " ",
                 "ports": [
                   {
                     "containerPort": 8080,
@@ -291,7 +291,7 @@
             "containers": [
               {
                 "name": "nodejs-helloworld",
-                "image": "origin-nodejs-sample",
+                "image": " ",
                 "ports": [
                   {
                     "containerPort": 8080,
diff --git a/examples/jenkins/jenkins-ephemeral-template.json b/examples/jenkins/jenkins-ephemeral-template.json
@@ -102,7 +102,7 @@
             "containers": [
               {
                 "name": "jenkins",
-                "image": "JENKINS_IMAGE",
+                "image": " ",
                 "readinessProbe": {
                   "timeoutSeconds": 3,
                   "initialDelaySeconds": 3,
diff --git a/examples/jenkins/jenkins-persistent-template.json b/examples/jenkins/jenkins-persistent-template.json
@@ -119,7 +119,7 @@
             "containers": [
               {
                 "name": "jenkins",
-                "image": "JENKINS_IMAGE",
+                "image": " ",
                 "readinessProbe": {
                   "timeoutSeconds": 3,
                   "initialDelaySeconds": 3,
diff --git a/examples/quickstarts/cakephp-mysql.json b/examples/quickstarts/cakephp-mysql.json
@@ -166,7 +166,7 @@
             "containers": [
               {
                 "name": "cakephp-mysql-example",
-                "image": "cakephp-mysql-example",
+                "image": " ",
                 "ports": [
                   {
                     "containerPort": 8080
@@ -312,7 +312,7 @@
             "containers": [
               {
                 "name": "mysql",
-                "image": "mysql",
+                "image": " ",
                 "ports": [
                   {
                     "containerPort": 3306
diff --git a/examples/quickstarts/dancer-mysql.json b/examples/quickstarts/dancer-mysql.json
@@ -152,7 +152,7 @@
             "containers": [
               {
                 "name": "dancer-mysql-example",
-                "image": "dancer-mysql-example",
+                "image": " ",
                 "ports": [
                   {
                     "containerPort": 8080
@@ -286,7 +286,7 @@
             "containers": [
               {
                 "name": "mysql",
-                "image": "mysql",
+                "image": " ",
                 "ports": [
                   {
                     "containerPort": 3306
diff --git a/examples/quickstarts/django-postgresql.json b/examples/quickstarts/django-postgresql.json
@@ -158,7 +158,7 @@
             "containers": [
               {
                 "name": "django-psql-example",
-                "image": "django-psql-example",
+                "image": " ",
                 "ports": [
                   {
                     "containerPort": 8080
@@ -296,7 +296,7 @@
             "containers": [
               {
                 "name": "postgresql",
-                "image": "postgresql",
+                "image": " ",
                 "ports": [
                   {
                     "containerPort": 5432
diff --git a/examples/quickstarts/nodejs-mongodb.json b/examples/quickstarts/nodejs-mongodb.json
@@ -164,7 +164,7 @@
             "containers": [
               {
                 "name": "nodejs-mongodb-example",
-                "image": "nodejs-mongodb-example",
+                "image": " ",
                 "ports": [
                   {
                     "containerPort": 8080
@@ -288,7 +288,7 @@
             "containers": [
               {
                 "name": "mongodb",
-                "image": "mongodb",
+                "image": " ",
                 "ports": [
                   {
                     "containerPort": 27017
diff --git a/examples/quickstarts/rails-postgresql.json b/examples/quickstarts/rails-postgresql.json
@@ -169,7 +169,7 @@
             "containers": [
               {
                 "name": "rails-postgresql-example",
-                "image": "rails-postgresql-example",
+                "image": " ",
                 "ports": [
                   {
                     "containerPort": 8080
@@ -323,7 +323,7 @@
             "containers": [
               {
                 "name": "postgresql",
-                "image": "postgresql",
+                "image": " ",
                 "ports": [
                   {
                     "containerPort": 5432
diff --git a/pkg/bootstrap/bindata.go b/pkg/bootstrap/bindata.go

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@`
`85`	`85`	`"containers": [`
`86`	`86`	`{`
`87`	`87`	`"name": "mongodb",`
`88`		`- "image": "mongodb",`
	`88`	`+ "image": " ",`
`89`	`89`	`"ports": [`
`90`	`90`	`{`
`91`	`91`	`"containerPort": 27017,`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@`
`102`	`102`	`"containers": [`
`103`	`103`	`{`
`104`	`104`	`"name": "mongodb",`
`105`		`- "image": "mongodb",`
	`105`	`+ "image": " ",`
`106`	`106`	`"ports": [`
`107`	`107`	`{`
`108`	`108`	`"containerPort": 27017,`
Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@`
`208`	`208`	`"containers": [`
`209`	`209`	`{`
`210`	`210`	`"name": "jenkins",`
`211`		`- "image": "jenkins-master",`
	`211`	`+ "image": " ",`
`212`	`212`	`"readinessProbe": {`
`213`	`213`	`"timeoutSeconds": 3,`
`214`	`214`	`"initialDelaySeconds": 3,`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@`
`108`	`108`	`"containers": [`
`109`	`109`	`{`
`110`	`110`	`"name": "nodejs-helloworld",`
`111`		`- "image": "origin-nodejs-sample",`
	`111`	`+ "image": " ",`
`112`	`112`	`"ports": [`
`113`	`113`	`{`
`114`	`114`	`"containerPort": 8080,`
`@@ -291,7 +291,7 @@`
`291`	`291`	`"containers": [`
`292`	`292`	`{`
`293`	`293`	`"name": "nodejs-helloworld",`
`294`		`- "image": "origin-nodejs-sample",`
	`294`	`+ "image": " ",`
`295`	`295`	`"ports": [`
`296`	`296`	`{`
`297`	`297`	`"containerPort": 8080,`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@`
`119`	`119`	`"containers": [`
`120`	`120`	`{`
`121`	`121`	`"name": "jenkins",`
`122`		`- "image": "JENKINS_IMAGE",`
	`122`	`+ "image": " ",`
`123`	`123`	`"readinessProbe": {`
`124`	`124`	`"timeoutSeconds": 3,`
`125`	`125`	`"initialDelaySeconds": 3,`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@`
`166`	`166`	`"containers": [`
`167`	`167`	`{`
`168`	`168`	`"name": "cakephp-mysql-example",`
`169`		`- "image": "cakephp-mysql-example",`
	`169`	`+ "image": " ",`
`170`	`170`	`"ports": [`
`171`	`171`	`{`
`172`	`172`	`"containerPort": 8080`
`@@ -312,7 +312,7 @@`
`312`	`312`	`"containers": [`
`313`	`313`	`{`
`314`	`314`	`"name": "mysql",`
`315`		`- "image": "mysql",`
	`315`	`+ "image": " ",`
`316`	`316`	`"ports": [`
`317`	`317`	`{`
`318`	`318`	`"containerPort": 3306`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@`
`152`	`152`	`"containers": [`
`153`	`153`	`{`
`154`	`154`	`"name": "dancer-mysql-example",`
`155`		`- "image": "dancer-mysql-example",`
	`155`	`+ "image": " ",`
`156`	`156`	`"ports": [`
`157`	`157`	`{`
`158`	`158`	`"containerPort": 8080`
`@@ -286,7 +286,7 @@`
`286`	`286`	`"containers": [`
`287`	`287`	`{`
`288`	`288`	`"name": "mysql",`
`289`		`- "image": "mysql",`
	`289`	`+ "image": " ",`
`290`	`290`	`"ports": [`
`291`	`291`	`{`
`292`	`292`	`"containerPort": 3306`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@`
`158`	`158`	`"containers": [`
`159`	`159`	`{`
`160`	`160`	`"name": "django-psql-example",`
`161`		`- "image": "django-psql-example",`
	`161`	`+ "image": " ",`
`162`	`162`	`"ports": [`
`163`	`163`	`{`
`164`	`164`	`"containerPort": 8080`
`@@ -296,7 +296,7 @@`
`296`	`296`	`"containers": [`
`297`	`297`	`{`
`298`	`298`	`"name": "postgresql",`
`299`		`- "image": "postgresql",`
	`299`	`+ "image": " ",`
`300`	`300`	`"ports": [`
`301`	`301`	`{`
`302`	`302`	`"containerPort": 5432`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@`
`164`	`164`	`"containers": [`
`165`	`165`	`{`
`166`	`166`	`"name": "nodejs-mongodb-example",`
`167`		`- "image": "nodejs-mongodb-example",`
	`167`	`+ "image": " ",`
`168`	`168`	`"ports": [`
`169`	`169`	`{`
`170`	`170`	`"containerPort": 8080`
`@@ -288,7 +288,7 @@`
`288`	`288`	`"containers": [`
`289`	`289`	`{`
`290`	`290`	`"name": "mongodb",`
`291`		`- "image": "mongodb",`
	`291`	`+ "image": " ",`
`292`	`292`	`"ports": [`
`293`	`293`	`{`
`294`	`294`	`"containerPort": 27017`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@`
`169`	`169`	`"containers": [`
`170`	`170`	`{`
`171`	`171`	`"name": "rails-postgresql-example",`
`172`		`- "image": "rails-postgresql-example",`
	`172`	`+ "image": " ",`
`173`	`173`	`"ports": [`
`174`	`174`	`{`
`175`	`175`	`"containerPort": 8080`
`@@ -323,7 +323,7 @@`
`323`	`323`	`"containers": [`
`324`	`324`	`{`
`325`	`325`	`"name": "postgresql",`
`326`		`- "image": "postgresql",`
	`326`	`+ "image": " ",`
`327`	`327`	`"ports": [`
`328`	`328`	`{`
`329`	`329`	`"containerPort": 5432`