Merge pull request #16911 from mesosphere/sttts-fix-cluster-dns-images

Auto commit by PR queue bot

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

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

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

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:

examples/cluster-dns/images/frontend/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:2.7
+FROM python:2.7-slim
 
 RUN pip install requests
 

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: