github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stop using dockerfile/* images

Browse Source 
As per
http://blog.docker.com/2015/03/updates-available-to-popular-repos-update-your-images/
docker has stopped answering dockerfile/redis and dockerfile/nginx.  Fix all
users in our tree.  Sadly this means a lot of published examples are now broken.
This commit is contained in:
Tim Hockin
2015-04-16 09:11:47 -07:00
parent 6c394e4d81
commit c2bacd588d
48 changed files with 119 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/celery-rabbitmq/README.md
View File

@@ -79,7 +79,7 @@ A RabbitMQ broker can be turned up using the file `examples/celery-rabbitmq/rabb
"id": "rabbitmq",
"containers": [{
"name": "rabbitmq",
"image": "dockerfile/rabbitmq",
"image": "library/rabbitmq",
"cpu": 100,
"ports": [{"containerPort": 5672, "hostPort": 5672}]
}]
@@ -144,7 +144,7 @@ There are several things to point out here...
Like the RabbitMQ controller, this controller ensures that there is always a pod is running a Celery worker instance. The celery-app-add Docker image is an extension of the standard Celery image. This is the Dockerfile:
```
FROM dockerfile/celery
FROM library/celery
ADD celery_conf.py /data/celery_conf.py
ADD run_tasks.py /data/run_tasks.py
@@ -239,7 +239,7 @@ flower-controller-cegta 10.246.2.17 flower endocode/flo
kube-dns-fplln 10.246.1.3 etcd quay.io/coreos/etcd:latest 10.245.1.3/10.245.1.3 k8s-app=kube-dns,kubernetes.io/cluster-service=true Running
kube2sky kubernetes/kube2sky:1.0
skydns kubernetes/skydns:2014-12-23-001
rabbitmq-controller-pjzb3 10.246.2.16 rabbitmq dockerfile/rabbitmq 10.245.1.4/10.245.1.4 app=taskQueue,name=rabbitmq Running
rabbitmq-controller-pjzb3 10.246.2.16 rabbitmq library/rabbitmq 10.245.1.4/10.245.1.4 app=taskQueue,name=rabbitmq Running
```

2
examples/celery-rabbitmq/celery-app-add/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM dockerfile/celery
FROM library/celery
ADD celery_conf.py /data/celery_conf.py
ADD run_tasks.py /data/run_tasks.py

2
examples/celery-rabbitmq/rabbitmq-controller.json
View File

@@ -12,7 +12,7 @@
"id": "rabbitmq",
"containers": [{
"name": "rabbitmq",
"image": "dockerfile/rabbitmq",
"image": "library/rabbitmq",
"cpu": 100,
"ports": [{"containerPort": 5672, "hostPort": 5672}]
}]