diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index 299353aa8..8c2e0067a 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -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: diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index cb4272f3e..6dbf368ef 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -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" ] diff --git a/examples/docker.yml b/examples/docker.yml index 3cf4caf85..3ffdfa358 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -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 diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 86edba2d5..0575f111c 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -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: diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index eb0b891a8..11616faf2 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -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: diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index 8c324b216..4d8e2d416 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -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