Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Workaround docker-pull issues with examples/cluster-dns #16911

Merged
merged 3 commits into from Nov 11, 2015
Merged

Workaround docker-pull issues with examples/cluster-dns #16911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe65598
Base cluster-dns on python:2.7-slim image
sttts Nov 6, 2015
da194b4
Move dns-frontend images to gcr.io
sttts Nov 6, 2015
28aa9b4
Add Makefile to build examples/cluster-dns images
sttts Nov 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/cluster-dns/dns-backend-rc.yaml
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: dns-backend
image: ddysher/dns-backend
image: gcr.io/google_containers/example-dns-backend:v1
ports:
- name: backend-port
containerPort: 8000
2 changes: 1 addition & 1 deletion examples/cluster-dns/dns-frontend-pod.yaml
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ metadata:
spec:
containers:
- name: dns-frontend
image: ddysher/dns-frontend
image: gcr.io/google_containers/example-dns-frontend:v1
command:
- python
- client.py
Expand Down
2 changes: 1 addition & 1 deletion examples/cluster-dns/images/backend/Dockerfile
View file
Open in desktop
@@ -1,4 +1,4 @@
FROM python:2.7
FROM python:2.7-slim

COPY . /dns-backend
WORKDIR /dns-backend
Expand Down
13 changes: 13 additions & 0 deletions examples/cluster-dns/images/backend/Makefile
View file
Open in desktop
@@ -0,0 +1,13 @@
TAG = v1
PREFIX = gcr.io/google_containers
IMAGE = example-dns-backend

all: push

image:
docker build -t $(PREFIX)/$(IMAGE):$(TAG) .

push: image
gcloud docker push $(PREFIX)/$(IMAGE)

clean:
2 changes: 1 addition & 1 deletion examples/cluster-dns/images/frontend/Dockerfile
View file
Open in desktop
@@ -1,4 +1,4 @@
FROM python:2.7
FROM python:2.7-slim
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we base the backend off of this too?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will check whether it's also happy with the slim version.


RUN pip install requests

Expand Down
13 changes: 13 additions & 0 deletions examples/cluster-dns/images/frontend/Makefile
View file
Open in desktop
@@ -0,0 +1,13 @@
TAG = v1
PREFIX = gcr.io/google_containers
IMAGE = example-dns-frontend

all: push

image:
docker build -t $(PREFIX)/$(IMAGE):$(TAG) .

push: image
gcloud docker push $(PREFIX)/$(IMAGE)

clean: