Commit 3d66f0fe authored by k8s-merge-robot's avatar k8s-merge-robot

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

Auto commit by PR queue bot
parents 398a4808 28aa9b4d
...@@ -15,7 +15,7 @@ spec: ...@@ -15,7 +15,7 @@ spec:
spec: spec:
containers: containers:
- name: dns-backend - name: dns-backend
image: ddysher/dns-backend image: gcr.io/google_containers/example-dns-backend:v1
ports: ports:
- name: backend-port - name: backend-port
containerPort: 8000 containerPort: 8000
...@@ -7,7 +7,7 @@ metadata: ...@@ -7,7 +7,7 @@ metadata:
spec: spec:
containers: containers:
- name: dns-frontend - name: dns-frontend
image: ddysher/dns-frontend image: gcr.io/google_containers/example-dns-frontend:v1
command: command:
- python - python
- client.py - client.py
......
FROM python:2.7 FROM python:2.7-slim
COPY . /dns-backend COPY . /dns-backend
WORKDIR /dns-backend WORKDIR /dns-backend
......
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:
FROM python:2.7 FROM python:2.7-slim
RUN pip install requests RUN pip install requests
......
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:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment