github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2026-01-14 03:48:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2860 from deitch/metadata-to-run

Browse Source 
Move metadata to /run instead of /var
This commit is contained in:
Avi Deitcher
2018-01-15 18:11:45 +02:00
committed by GitHub
parent 34bd0689b6 2af908d1b7
commit 190a87557f
8 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,7 @@ init:
- linuxkit/containerd:1b6b8a5884e17b26e2725cb82c436841070fca95
- linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
onboot:
# support metadata for optional config in /var/config
# support metadata for optional config in /run/config
- name: metadata
image: linuxkit/metadata:2af15c9f4b0e73515c219b7cc14e6e65e1d4fd6d
- name: sysctl

4
blueprints/docker-for-mac/docker-ce.yml
View File

@@ -1,7 +1,7 @@
services:
# Run dockerd with the vpnkit userland proxy from the vpnkit-forwarder container.
# Bind mounts /var/run to allow vsudd to connect to docker.sock, /var/vpnkit
# for vpnkit coordination and /var/config/docker for the configuration file.
# for vpnkit coordination and /run/config/docker for the configuration file.
- name: docker-dfm
image: docker:17.07.0-ce-dind
capabilities:
@@ -16,7 +16,7 @@ services:
- /lib/modules:/lib/modules
- /var/vpnkit:/port # vpnkit control 9p mount
- /var/run:/var/run
- /var/config/docker:/var/config/docker
- /run/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/local/bin/docker-init", "/usr/local/bin/dockerd", "--",