From fe6559829a4682d82c1836798a07376578ffb2a6 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Fri, 6 Nov 2015 10:38:05 +0100 Subject: [PATCH 1/3] Base cluster-dns on python:2.7-slim image - 79 instead of 263 MB - does not trigger the docker-pull freeze bug --- examples/cluster-dns/images/backend/Dockerfile | 2 +- examples/cluster-dns/images/frontend/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/cluster-dns/images/backend/Dockerfile b/examples/cluster-dns/images/backend/Dockerfile index 915a2d19020..d45858468e9 100644 --- a/examples/cluster-dns/images/backend/Dockerfile +++ b/examples/cluster-dns/images/backend/Dockerfile @@ -1,4 +1,4 @@ -FROM python:2.7 +FROM python:2.7-slim COPY . /dns-backend WORKDIR /dns-backend diff --git a/examples/cluster-dns/images/frontend/Dockerfile b/examples/cluster-dns/images/frontend/Dockerfile index 6046b7e1afb..a2662881394 100644 --- a/examples/cluster-dns/images/frontend/Dockerfile +++ b/examples/cluster-dns/images/frontend/Dockerfile @@ -1,4 +1,4 @@ -FROM python:2.7 +FROM python:2.7-slim RUN pip install requests From da194b4637206057c5f3b75cf4292d6aa7bfeba7 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Fri, 6 Nov 2015 10:43:52 +0100 Subject: [PATCH 2/3] Move dns-frontend images to gcr.io --- examples/cluster-dns/dns-backend-rc.yaml | 2 +- examples/cluster-dns/dns-frontend-pod.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/cluster-dns/dns-backend-rc.yaml b/examples/cluster-dns/dns-backend-rc.yaml index f21356f328e..9649d367b54 100644 --- a/examples/cluster-dns/dns-backend-rc.yaml +++ b/examples/cluster-dns/dns-backend-rc.yaml @@ -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 diff --git a/examples/cluster-dns/dns-frontend-pod.yaml b/examples/cluster-dns/dns-frontend-pod.yaml index 9967f4255b2..443e4aa207f 100644 --- a/examples/cluster-dns/dns-frontend-pod.yaml +++ b/examples/cluster-dns/dns-frontend-pod.yaml @@ -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 From 28aa9b4d35ad31dc103e0fb7b2d2a7a052aed2a0 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Wed, 11 Nov 2015 17:18:35 +0100 Subject: [PATCH 3/3] Add Makefile to build examples/cluster-dns images --- examples/cluster-dns/images/backend/Makefile | 13 +++++++++++++ examples/cluster-dns/images/frontend/Makefile | 13 +++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 examples/cluster-dns/images/backend/Makefile create mode 100644 examples/cluster-dns/images/frontend/Makefile diff --git a/examples/cluster-dns/images/backend/Makefile b/examples/cluster-dns/images/backend/Makefile new file mode 100644 index 00000000000..1b5ae02503f --- /dev/null +++ b/examples/cluster-dns/images/backend/Makefile @@ -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: diff --git a/examples/cluster-dns/images/frontend/Makefile b/examples/cluster-dns/images/frontend/Makefile new file mode 100644 index 00000000000..a987ff7b67f --- /dev/null +++ b/examples/cluster-dns/images/frontend/Makefile @@ -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: