Add a system containerd

This adds an independent system containerd for running internal
containers.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2016-07-14 12:28:44 +01:00
parent a14f34701e
commit 220f3df37a
4 changed files with 30 additions and 1 deletions

View File

@ -76,6 +76,7 @@ COPY packages/test/etc /etc
COPY packages/test/mobytest /usr/bin COPY packages/test/mobytest /usr/bin
COPY packages/sysctl/etc /etc COPY packages/sysctl/etc /etc
COPY packages/iptables/iptables /usr/local/sbin/iptables COPY packages/iptables/iptables /usr/local/sbin/iptables
COPY packages/containerd/etc /etc/
RUN \ RUN \
rc-update add swap boot && \ rc-update add swap boot && \
@ -112,10 +113,17 @@ RUN \
rc-update add hv_vss_daemon default && \ rc-update add hv_vss_daemon default && \
rc-update add oom default && \ rc-update add oom default && \
rc-update add test default && \ rc-update add test default && \
rc-update add containerd default && \
true true
COPY init / COPY init /
RUN adduser -D -H -s /sbin/nologin dockremap RUN adduser -D -H -s /sbin/nologin dockremap
RUN cd /usr/bin && \
ln -s docker-runc runc && \
ln -s docker-containerd-shim containerd-shim && \
ln -s docker-containerd-ctr containerd-ctr && \
ln -s docker-containerd containerd
CMD ["/bin/sh"] CMD ["/bin/sh"]

View File

@ -0,0 +1,17 @@
#!/sbin/openrc-run
depend()
{
after docker
}
start()
{
ebegin "Running system containerd"
# set ulimits as high as possible
ulimit -n 1048576
ulimit -p unlimited
/usr/bin/containerd &
}

View File

@ -28,5 +28,9 @@ DOCKERPS=$(docker ps 2>&1)
[ $? -eq 0 ] && printf "✓ Docker daemon working\n" || printf "✗ Docker ps failed: $DOCKERPS\n" [ $? -eq 0 ] && printf "✓ Docker daemon working\n" || printf "✗ Docker ps failed: $DOCKERPS\n"
DIAGNOSTICS=$(ps -eo args | grep '/usr/bin/diagnostics-server$') DIAGNOSTICS=$(ps -eo args | grep '/usr/bin/diagnostics-server$')
[ $? -eq 0 ] && printf "✓ Diagnostics server running: $DIAGNOSTICS\n" || printf "✗ No diagnostics server\n" [ $? -eq 0 ] && printf "✓ Diagnostics server running: $DIAGNOSTICS\n" || printf "✗ No diagnostics server\n"
CONTAINERD=$(ps -eo args | grep '/usr/bin/containerd$')
[ $? -eq 0 ] && printf "✓ System containerd server running: $DIAGNOSTICS\n" || printf "✗ No containerd server\n"
CONTAINERPS=$(containerd-ctr containers 2>&1)
[ $? -eq 0 ] && printf "✓ System containerd working\n" || printf "✗ containerd failed: $CONTAINERPS\n"
exit 0 exit 0

View File

@ -2,7 +2,7 @@
depend() depend()
{ {
after docker after docker containerd
} }
start() start()