From 8270bdfe339c92d6d0c89536e34a1eac5102ef77 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 5 Apr 2017 10:37:55 +0100 Subject: [PATCH 1/2] Use exec in a couple of places to avoid needless lingering /bin/sh processes ``` $ apk -U add procps $ ps xf 1 ? Ss 0:05 /sbin/init 357 ? Ss 0:00 /bin/sh /etc/init.d/containerd 359 ? Sl 0:00 \_ /usr/bin/containerd 360 ? Ss 0:00 /bin/sh /etc/init.d/containers 432 ? Sl 0:00 \_ /usr/bin/runc run --bundle /containers/daemon/swa 466 ? Ssl 0:00 | \_ /usr/bin/swarmd --containerd-addr=/run/contai 427 ? Sl 0:00 \_ /usr/bin/runc run --bundle /containers/daemon/dhc 457 ? Ss 0:00 | \_ bin/sh /usr/local/bin/start_dhcpcd.sh 474 ? S 0:00 | \_ /sbin/dhcpcd --nobackground 429 ? Sl 0:00 \_ /usr/bin/runc run --bundle /containers/daemon/rng 576 ? Ss 0:00 \_ /bin/tini /usr/sbin/rngd -f 580 ? S 0:00 \_ /usr/sbin/rngd -f ``` becomes ``` $ ps xf 1 ? Ss 0:06 /sbin/init 358 ? Ss 0:00 /bin/sh /etc/init.d/containers 426 ? Sl 0:00 \_ /usr/bin/runc run --bundle /containers/daemon/dhc 458 ? Ss 0:00 | \_ /sbin/dhcpcd --nobackground 431 ? Sl 0:00 \_ /usr/bin/runc run --bundle /containers/daemon/swa 460 ? Ssl 0:00 | \_ /usr/bin/swarmd --containerd-addr=/run/contai 428 ? Sl 0:00 \_ /usr/bin/runc run --bundle /containers/daemon/rng 574 ? Ss 0:00 \_ /bin/tini /usr/sbin/rngd -f 578 ? S 0:00 \_ /usr/sbin/rngd -f 356 ? Ssl 0:00 /usr/bin/containerd ``` Specifically these are gone: 357 ? Ss 0:00 /bin/sh /etc/init.d/containerd 457 ? Ss 0:00 | \_ bin/sh /usr/local/bin/start_dhcpcd.sh Signed-off-by: Ian Campbell --- examples/gcp.yml | 4 ++-- examples/sshd.yml | 4 ++-- examples/vmware.yml | 4 ++-- moby.yml | 4 ++-- pkg/dhcpcd/start_dhcpcd.sh | 2 +- pkg/init/etc/init.d/containerd | 2 +- projects/swarmd/swarmd.yml | 4 ++-- test/ltp/test-ltp.yml | 4 ++-- test/test.yml | 4 ++-- test/virtsock/test-virtsock-server.yml | 4 ++-- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/examples/gcp.yml b/examples/gcp.yml index e3a0b9d18..2a6c30beb 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -1,7 +1,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" -init: "mobylinux/init:a27e32a8d6c8865d691fbfb4d0bbb93846cf7802" +init: "mobylinux/init:bdc1897c40048c9ab490681be2b89ccf5740ff77" system: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" @@ -34,7 +34,7 @@ daemon: oomScoreAdj: -800 readonly: true - name: dhcpcd - image: "mobylinux/dhcpcd:d01a17d211218f289e2bac601bfe9787d4fabaf2" + image: "mobylinux/dhcpcd:57a8ef29d3a910645b2b24c124f9ce9ef53ce703" binds: - /var:/var - /tmp:/etc diff --git a/examples/sshd.yml b/examples/sshd.yml index b669c3d4a..de0ceece9 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -1,7 +1,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" -init: "mobylinux/init:a27e32a8d6c8865d691fbfb4d0bbb93846cf7802" +init: "mobylinux/init:bdc1897c40048c9ab490681be2b89ccf5740ff77" system: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" @@ -21,7 +21,7 @@ daemon: - CAP_SYS_ADMIN oomScoreAdj: -800 - name: dhcpcd - image: "mobylinux/dhcpcd:d01a17d211218f289e2bac601bfe9787d4fabaf2" + image: "mobylinux/dhcpcd:57a8ef29d3a910645b2b24c124f9ce9ef53ce703" binds: - /var:/var - /tmp:/etc diff --git a/examples/vmware.yml b/examples/vmware.yml index ac4d2d551..fb9d90731 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -1,7 +1,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=tty0 page_poison=1" -init: "mobylinux/init:a27e32a8d6c8865d691fbfb4d0bbb93846cf7802" +init: "mobylinux/init:bdc1897c40048c9ab490681be2b89ccf5740ff77" system: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" @@ -24,7 +24,7 @@ daemon: oomScoreAdj: -800 readonly: true - name: dhcpcd - image: "mobylinux/dhcpcd:d01a17d211218f289e2bac601bfe9787d4fabaf2" + image: "mobylinux/dhcpcd:57a8ef29d3a910645b2b24c124f9ce9ef53ce703" binds: - /var:/var - /tmp:/etc diff --git a/moby.yml b/moby.yml index 833efb680..3d4080a72 100644 --- a/moby.yml +++ b/moby.yml @@ -1,7 +1,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" -init: "mobylinux/init:a27e32a8d6c8865d691fbfb4d0bbb93846cf7802" +init: "mobylinux/init:bdc1897c40048c9ab490681be2b89ccf5740ff77" system: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" @@ -24,7 +24,7 @@ daemon: oomScoreAdj: -800 readonly: true - name: dhcpcd - image: "mobylinux/dhcpcd:d01a17d211218f289e2bac601bfe9787d4fabaf2" + image: "mobylinux/dhcpcd:57a8ef29d3a910645b2b24c124f9ce9ef53ce703" binds: - /var:/var - /tmp/etc:/etc diff --git a/pkg/dhcpcd/start_dhcpcd.sh b/pkg/dhcpcd/start_dhcpcd.sh index e16a0c31e..3a84269a5 100755 --- a/pkg/dhcpcd/start_dhcpcd.sh +++ b/pkg/dhcpcd/start_dhcpcd.sh @@ -6,4 +6,4 @@ ip link set eth0 up cp /dhcpcd.conf /etc/dhcpcd.conf -/sbin/dhcpcd --nobackground \ No newline at end of file +exec /sbin/dhcpcd --nobackground diff --git a/pkg/init/etc/init.d/containerd b/pkg/init/etc/init.d/containerd index 3580608dd..22c999ce6 100755 --- a/pkg/init/etc/init.d/containerd +++ b/pkg/init/etc/init.d/containerd @@ -6,4 +6,4 @@ ulimit -p unlimited printf "\nStarting containerd\n" mkdir -p /var/log -/sbin/start-stop-daemon --start --exec /usr/bin/containerd +exec /sbin/start-stop-daemon --start --exec /usr/bin/containerd diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index 1d4487b43..8274a3230 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -1,7 +1,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" -init: "mobylinux/init:a27e32a8d6c8865d691fbfb4d0bbb93846cf7802" +init: "mobylinux/init:bdc1897c40048c9ab490681be2b89ccf5740ff77" system: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" @@ -24,7 +24,7 @@ daemon: oomScoreAdj: -800 readonly: true - name: dhcpcd - image: "mobylinux/dhcpcd:d01a17d211218f289e2bac601bfe9787d4fabaf2" + image: "mobylinux/dhcpcd:57a8ef29d3a910645b2b24c124f9ce9ef53ce703" binds: - /var:/var - /tmp/etc:/etc diff --git a/test/ltp/test-ltp.yml b/test/ltp/test-ltp.yml index 23af67500..a34adb4df 100644 --- a/test/ltp/test-ltp.yml +++ b/test/ltp/test-ltp.yml @@ -1,7 +1,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0" -init: "mobylinux/init:a27e32a8d6c8865d691fbfb4d0bbb93846cf7802" +init: "mobylinux/init:bdc1897c40048c9ab490681be2b89ccf5740ff77" system: - name: ltp image: "mobylinux/test-ltp-20170116:fdca2d1bb019b1d51e722e6032c82c7933d4b870" @@ -11,7 +11,7 @@ system: - CAP_SYS_ADMIN daemon: - name: dhcpcd - image: "mobylinux/dhcpcd:d01a17d211218f289e2bac601bfe9787d4fabaf2" + image: "mobylinux/dhcpcd:57a8ef29d3a910645b2b24c124f9ce9ef53ce703" binds: - /var:/var - /tmp:/etc diff --git a/test/test.yml b/test/test.yml index ad47387e1..a7aa38caf 100644 --- a/test/test.yml +++ b/test/test.yml @@ -1,7 +1,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0" -init: "mobylinux/init:a27e32a8d6c8865d691fbfb4d0bbb93846cf7802" +init: "mobylinux/init:bdc1897c40048c9ab490681be2b89ccf5740ff77" system: - name: binfmt image: "mobylinux/binfmt:bdb754f25a5d851b4f5f8d185a43dfcbb3c22d01" @@ -16,7 +16,7 @@ system: readonly: true daemon: - name: dhcpcd - image: "mobylinux/dhcpcd:d01a17d211218f289e2bac601bfe9787d4fabaf2" + image: "mobylinux/dhcpcd:57a8ef29d3a910645b2b24c124f9ce9ef53ce703" binds: - /var:/var - /tmp:/etc diff --git a/test/virtsock/test-virtsock-server.yml b/test/virtsock/test-virtsock-server.yml index c27db9c22..60d8d9974 100644 --- a/test/virtsock/test-virtsock-server.yml +++ b/test/virtsock/test-virtsock-server.yml @@ -5,7 +5,7 @@ kernel: # image: "mobylinux/kernel:4.9.14-0" image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" -init: "mobylinux/init:a27e32a8d6c8865d691fbfb4d0bbb93846cf7802" +init: "mobylinux/init:bdc1897c40048c9ab490681be2b89ccf5740ff77" system: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" @@ -23,7 +23,7 @@ daemon: oomScoreAdj: -800 readonly: true - name: dhcpcd - image: "mobylinux/dhcpcd:d01a17d211218f289e2bac601bfe9787d4fabaf2" + image: "mobylinux/dhcpcd:57a8ef29d3a910645b2b24c124f9ce9ef53ce703" binds: - /var:/var - /tmp:/etc From 2b54e18f9f746fe3afb952bce26f84d93f537958 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 5 Apr 2017 16:39:14 +0100 Subject: [PATCH 2/2] Drop unnecessary use of start-stop-daemon with containerd. Signed-off-by: Ian Campbell --- examples/gcp.yml | 2 +- examples/sshd.yml | 2 +- examples/vmware.yml | 2 +- moby.yml | 2 +- pkg/init/etc/init.d/containerd | 2 +- projects/swarmd/swarmd.yml | 2 +- test/ltp/test-ltp.yml | 2 +- test/test.yml | 2 +- test/virtsock/test-virtsock-server.yml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/gcp.yml b/examples/gcp.yml index 2a6c30beb..155e90171 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -1,7 +1,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" -init: "mobylinux/init:bdc1897c40048c9ab490681be2b89ccf5740ff77" +init: "mobylinux/init:c0007f0cdf1ef821a981fcc676e3f1c2dd9ab5b1" system: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" diff --git a/examples/sshd.yml b/examples/sshd.yml index de0ceece9..e05009b09 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -1,7 +1,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" -init: "mobylinux/init:bdc1897c40048c9ab490681be2b89ccf5740ff77" +init: "mobylinux/init:c0007f0cdf1ef821a981fcc676e3f1c2dd9ab5b1" system: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" diff --git a/examples/vmware.yml b/examples/vmware.yml index fb9d90731..bc500367e 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -1,7 +1,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=tty0 page_poison=1" -init: "mobylinux/init:bdc1897c40048c9ab490681be2b89ccf5740ff77" +init: "mobylinux/init:c0007f0cdf1ef821a981fcc676e3f1c2dd9ab5b1" system: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" diff --git a/moby.yml b/moby.yml index 3d4080a72..1b74c172a 100644 --- a/moby.yml +++ b/moby.yml @@ -1,7 +1,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" -init: "mobylinux/init:bdc1897c40048c9ab490681be2b89ccf5740ff77" +init: "mobylinux/init:c0007f0cdf1ef821a981fcc676e3f1c2dd9ab5b1" system: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" diff --git a/pkg/init/etc/init.d/containerd b/pkg/init/etc/init.d/containerd index 22c999ce6..f62710d7e 100755 --- a/pkg/init/etc/init.d/containerd +++ b/pkg/init/etc/init.d/containerd @@ -6,4 +6,4 @@ ulimit -p unlimited printf "\nStarting containerd\n" mkdir -p /var/log -exec /sbin/start-stop-daemon --start --exec /usr/bin/containerd +exec /usr/bin/containerd diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index 8274a3230..1ae8e4140 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -1,7 +1,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" -init: "mobylinux/init:bdc1897c40048c9ab490681be2b89ccf5740ff77" +init: "mobylinux/init:c0007f0cdf1ef821a981fcc676e3f1c2dd9ab5b1" system: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" diff --git a/test/ltp/test-ltp.yml b/test/ltp/test-ltp.yml index a34adb4df..d0b2c100d 100644 --- a/test/ltp/test-ltp.yml +++ b/test/ltp/test-ltp.yml @@ -1,7 +1,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0" -init: "mobylinux/init:bdc1897c40048c9ab490681be2b89ccf5740ff77" +init: "mobylinux/init:c0007f0cdf1ef821a981fcc676e3f1c2dd9ab5b1" system: - name: ltp image: "mobylinux/test-ltp-20170116:fdca2d1bb019b1d51e722e6032c82c7933d4b870" diff --git a/test/test.yml b/test/test.yml index a7aa38caf..bc465465c 100644 --- a/test/test.yml +++ b/test/test.yml @@ -1,7 +1,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0" -init: "mobylinux/init:bdc1897c40048c9ab490681be2b89ccf5740ff77" +init: "mobylinux/init:c0007f0cdf1ef821a981fcc676e3f1c2dd9ab5b1" system: - name: binfmt image: "mobylinux/binfmt:bdb754f25a5d851b4f5f8d185a43dfcbb3c22d01" diff --git a/test/virtsock/test-virtsock-server.yml b/test/virtsock/test-virtsock-server.yml index 60d8d9974..c4a4409ea 100644 --- a/test/virtsock/test-virtsock-server.yml +++ b/test/virtsock/test-virtsock-server.yml @@ -5,7 +5,7 @@ kernel: # image: "mobylinux/kernel:4.9.14-0" image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" -init: "mobylinux/init:bdc1897c40048c9ab490681be2b89ccf5740ff77" +init: "mobylinux/init:c0007f0cdf1ef821a981fcc676e3f1c2dd9ab5b1" system: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"