Merge pull request #6917 from thockin/dockerfile-images-are-dead

Stop using dockerfile/* images
This commit is contained in:
Alex Robinson
2015-04-16 13:30:50 -07:00
48 changed files with 119 additions and 103 deletions

View File

@@ -483,7 +483,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{
{
Name: "nginx",
Image: "dockerfile/nginx",
Image: "nginx",
},
},
},
@@ -555,7 +555,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{
{
Name: "nginx",
Image: "dockerfile/nginx",
Image: "nginx",
Ports: []api.Port{{ContainerPort: 80}},
},
},