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

@@ -46,7 +46,7 @@ The `kubectl.sh` line below spins up two containers running
[Nginx](http://nginx.org/en/) running on port 80:
```bash
cluster/kubectl.sh run-container my-nginx --image=dockerfile/nginx --replicas=2 --port=80
cluster/kubectl.sh run-container my-nginx --image=nginx --replicas=2 --port=80
```
To stop the containers:
@@ -85,7 +85,7 @@ Where pod.json contains something like:
"id": "php",
"containers": [{
"name": "nginx",
"image": "dockerfile/nginx",
"image": "nginx",
"ports": [{
"containerPort": 80,
"hostPort": 8080