Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
3d66f0fe
Commit
3d66f0fe
authored
Nov 11, 2015
by
k8s-merge-robot
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #16911 from mesosphere/sttts-fix-cluster-dns-images
Auto commit by PR queue bot
parents
398a4808
28aa9b4d
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
30 additions
and
4 deletions
+30
-4
dns-backend-rc.yaml
examples/cluster-dns/dns-backend-rc.yaml
+1
-1
dns-frontend-pod.yaml
examples/cluster-dns/dns-frontend-pod.yaml
+1
-1
Dockerfile
examples/cluster-dns/images/backend/Dockerfile
+1
-1
Makefile
examples/cluster-dns/images/backend/Makefile
+13
-0
Dockerfile
examples/cluster-dns/images/frontend/Dockerfile
+1
-1
Makefile
examples/cluster-dns/images/frontend/Makefile
+13
-0
No files found.
examples/cluster-dns/dns-backend-rc.yaml
View file @
3d66f0fe
...
@@ -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
examples/cluster-dns/dns-frontend-pod.yaml
View file @
3d66f0fe
...
@@ -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
...
...
examples/cluster-dns/images/backend/Dockerfile
View file @
3d66f0fe
FROM
python:2.7
FROM
python:2.7
-slim
COPY
. /dns-backend
COPY
. /dns-backend
WORKDIR
/dns-backend
WORKDIR
/dns-backend
...
...
examples/cluster-dns/images/backend/Makefile
0 → 100644
View file @
3d66f0fe
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
View file @
3d66f0fe
FROM
python:2.7
FROM
python:2.7
-slim
RUN
pip
install
requests
RUN
pip
install
requests
...
...
examples/cluster-dns/images/frontend/Makefile
0 → 100644
View file @
3d66f0fe
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
:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment