github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 17:26:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2048 from MagnusS/vpnkit-docker-ce

Browse Source 
pkg/docker-ce: add vpnkit-expose-port
This commit is contained in:
Justin Cormack 2017-06-15 15:18:54 -07:00 committed by GitHub
commit 684b77d62b
8 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/docker.yml
View File

@ -30,7 +30,7 @@ services:
- name: ntpd
image: "linuxkit/openntpd:45deeb05f736162d941c9bf494983f655ab80aa5"
- name: docker
image: "linuxkit/docker-ce:668d62da6e3da081a8f8aca7db3e2a98adf5da59"
image: "linuxkit/docker-ce:dda71ff9fe5ebbfa794b98c57c32df286b212848"
capabilities:
- all
net: host

2
pkg/docker-ce/Dockerfile
View File

@ -17,8 +17,10 @@ RUN apk add --no-cache --initdb -p /out \
xz
RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
FROM linuxkit/vpnkit-forwarder:883de832c2c3cb72cd9b01e3f7bd788649e0f2c2 AS vpnkit
FROM scratch
COPY --from=mirror /out/ /
COPY --from=vpnkit /vpnkit-expose-port /usr/bin/vpnkit-expose-port
# set up Docker group
# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box

2
projects/compose/compose-dynamic.yml
View File

@ -27,7 +27,7 @@ services:
- name: ntpd
image: "linuxkit/openntpd:45deeb05f736162d941c9bf494983f655ab80aa5"
- name: docker
image: "linuxkit/docker-ce:668d62da6e3da081a8f8aca7db3e2a98adf5da59"
image: "linuxkit/docker-ce:dda71ff9fe5ebbfa794b98c57c32df286b212848"
capabilities:
- all
net: host

2
projects/compose/compose-static.yml
View File

@ -27,7 +27,7 @@ services:
- name: ntpd
image: "linuxkit/openntpd:45deeb05f736162d941c9bf494983f655ab80aa5"
- name: docker
image: "linuxkit/docker-ce:668d62da6e3da081a8f8aca7db3e2a98adf5da59"
image: "linuxkit/docker-ce:dda71ff9fe5ebbfa794b98c57c32df286b212848"
capabilities:
- all
net: host

2
projects/kubernetes/image-cache/Dockerfile
View File

@ -1,4 +1,4 @@
FROM linuxkit/docker-ce:668d62da6e3da081a8f8aca7db3e2a98adf5da59
FROM linuxkit/docker-ce:dda71ff9fe5ebbfa794b98c57c32df286b212848
ADD . /images
ENTRYPOINT [ "/bin/sh", "-c" ]
CMD [ "for image in /images/*.tar ; do docker image load -i $image && rm -f $image ; done" ]

2
projects/kubernetes/kube-master.yml
View File

@ -38,7 +38,7 @@ services:
- name: sshd
image: "linuxkit/sshd:abc1f5e096982ebc3fb61c506aed3ac9c2ae4d55"
- name: docker
image: "linuxkit/docker-ce:668d62da6e3da081a8f8aca7db3e2a98adf5da59"
image: "linuxkit/docker-ce:dda71ff9fe5ebbfa794b98c57c32df286b212848"
capabilities:
- all
net: host

2
projects/kubernetes/kube-node.yml
View File

@ -38,7 +38,7 @@ services:
- name: sshd
image: "linuxkit/sshd:abc1f5e096982ebc3fb61c506aed3ac9c2ae4d55"
- name: docker
image: "linuxkit/docker-ce:668d62da6e3da081a8f8aca7db3e2a98adf5da59"
image: "linuxkit/docker-ce:dda71ff9fe5ebbfa794b98c57c32df286b212848"
capabilities:
- all
net: host

2
test/cases/030_security/000_docker-bench/test-docker-bench.yml
View File

@ -24,7 +24,7 @@ services:
- name: dhcpcd
image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1"
- name: docker
image: "linuxkit/docker-ce:668d62da6e3da081a8f8aca7db3e2a98adf5da59"
image: "linuxkit/docker-ce:dda71ff9fe5ebbfa794b98c57c32df286b212848"
capabilities:
- all
net: host