mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-19 01:06:27 +00:00
Merge b2110184c1
into 89a95f958e
This commit is contained in:
commit
7127981ea1
@ -44,7 +44,8 @@ services:
|
||||
- /var/run:/var/run
|
||||
- /lib/modules:/lib/modules
|
||||
- /etc/docker/daemon.json:/etc/docker/daemon.json
|
||||
command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"]
|
||||
command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd", "--",
|
||||
"--oom-score-adjust", "-500"]
|
||||
- name: cadvisor
|
||||
image: linuxkit/cadvisor:8dfefe0f9593ba21aca5d08fadac16de907d470d
|
||||
files:
|
||||
|
@ -101,6 +101,7 @@ services:
|
||||
- /usr/bin/vpnkit-iptables-wrapper:/usr/bin/iptables # iptables wrapper
|
||||
command: [ "/usr/local/bin/docker-init", "/usr/local/bin/dockerd", "--",
|
||||
"--config-file", "/var/config/docker/daemon.json",
|
||||
"--oom-score-adjust", "-500",
|
||||
"--swarm-default-advertise-addr=eth0",
|
||||
"--userland-proxy-path", "/usr/bin/vpnkit-expose-port",
|
||||
"--storage-driver", "overlay2" ]
|
||||
|
@ -40,7 +40,8 @@ services:
|
||||
- /var/lib/docker:/var/lib/docker
|
||||
- /lib/modules:/lib/modules
|
||||
- /etc/docker/daemon.json:/etc/docker/daemon.json
|
||||
command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"]
|
||||
command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd", "--",
|
||||
"--oom-score-adjust", "-500"]
|
||||
files:
|
||||
- path: var/lib/docker
|
||||
directory: true
|
||||
|
@ -42,7 +42,8 @@ services:
|
||||
- /lib/modules:/lib/modules
|
||||
- /var/run:/var/run
|
||||
- /etc/html:/var/html
|
||||
command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"]
|
||||
command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd", "--",
|
||||
"--oom-score-adjust", "-500"]
|
||||
- name: compose
|
||||
image: linuxkitprojects/compose:111f9f32a933c9e7acbf3ccfc13fedbdfce8224f
|
||||
binds:
|
||||
|
@ -42,7 +42,8 @@ services:
|
||||
- /lib/modules:/lib/modules
|
||||
- /var/run:/var/run
|
||||
- /etc/html:/var/html
|
||||
command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"]
|
||||
command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd", "--",
|
||||
"--oom-score-adjust", "-500"]
|
||||
- name: compose
|
||||
image: linuxkitprojects/compose:111f9f32a933c9e7acbf3ccfc13fedbdfce8224f
|
||||
binds:
|
||||
|
@ -32,7 +32,8 @@ services:
|
||||
- /var/lib/docker:/var/lib/docker
|
||||
- /lib/modules:/lib/modules
|
||||
- /run:/var/run
|
||||
command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"]
|
||||
command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd", "--",
|
||||
"--oom-score-adjust", "-500"]
|
||||
- name: test-docker-bench
|
||||
image: linuxkit/test-docker-bench:04223ac05d270da7f3995fcbd6b820c477aacdf6
|
||||
ipc: host
|
||||
|
Loading…
Reference in New Issue
Block a user