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

blueprints: update docker-for-mac.yml to latest vpnkit packages

Browse Source 
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
This commit is contained in:
Magnus Skjegstad 2017-06-29 14:08:28 +02:00
parent f48a2bfe12
commit b2439251dd
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
blueprints/docker-for-mac/base.yml
View File

@ -3,6 +3,7 @@ kernel:
image: "linuxkit/kernel:4.9.34" image: "linuxkit/kernel:4.9.34"
cmdline: "console=ttyS0 page_poison=1" cmdline: "console=ttyS0 page_poison=1"
init: init:
- linuxkit/vpnkit-expose-port:b9bbd9b79c4682daec991c71934341b50772de00 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host
- linuxkit/init:36c56f0664d49c5a6adc1120d1bf5ba6ac30b389 - linuxkit/init:36c56f0664d49c5a6adc1120d1bf5ba6ac30b389
- linuxkit/runc:291131ec026430371e7c36165c3f43734fbc2541 - linuxkit/runc:291131ec026430371e7c36165c3f43734fbc2541
- linuxkit/containerd:1e3e8f207421de8deac8cedc26a138d6b1661a0d - linuxkit/containerd:1e3e8f207421de8deac8cedc26a138d6b1661a0d
@ -52,7 +53,7 @@ services:
# vpnkit-forwarder forwards network traffic to/from the host via VSOCK port 62373. # vpnkit-forwarder forwards network traffic to/from the host via VSOCK port 62373.
# It needs access to the vpnkit 9P coordination share # It needs access to the vpnkit 9P coordination share
- name: vpnkit-forwarder - name: vpnkit-forwarder
image: "linuxkit/vpnkit-forwarder:e2776b82ddfe82ed7f90e55d7a2b424e62e9a279" image: "linuxkit/vpnkit-forwarder:79aaeefac19b396396a3d3073c0a082735e86673"
binds: binds:
- /var/vpnkit:/port - /var/vpnkit:/port
net: host net: host

13
blueprints/docker-for-mac/docker-17.06-ce.yml
View File

@ -11,11 +11,14 @@ services:
- type: cgroup - type: cgroup
options: ["rw","nosuid","noexec","nodev","relatime"] options: ["rw","nosuid","noexec","nodev","relatime"]
binds: binds:
- /var/lib/docker:/var/lib/docker - /var/lib/docker:/var/lib/docker
- /lib/modules:/lib/modules - /lib/modules:/lib/modules
- /var/vpnkit:/port - /var/vpnkit:/port
- /var/run:/var/run - /var/vpnkit:/port # vpnkit control 9p mount
- /var/config/docker:/var/config/docker - /var/run:/var/run
- /var/config/docker:/var/config/docker
- /usr/bin/vpnkit-expose-port:/usr/bin/vpnkit-expose-port # userland proxy
- /usr/bin/vpnkit-iptables-wrapper:/usr/bin/iptables # iptables wrapper
command: [ "/usr/bin/docker-init", "/usr/bin/dockerd", "--", command: [ "/usr/bin/docker-init", "/usr/bin/dockerd", "--",
"--config-file", "/var/config/docker/daemon.json", "--config-file", "/var/config/docker/daemon.json",
"--swarm-default-advertise-addr=eth0", "--swarm-default-advertise-addr=eth0",