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

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
8 changed files with 9 additions and 7 deletions

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

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

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" ]

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

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