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

Shift to development track containerd

Browse Source 
Move to the development track of `containerd` not the legacy 0.2
branch. The commands have changed a bit.

This does increase the image size as we are bundling the Docker
copy and our copy, and the new one is larger as it is growing features.
Hopefully Docker will shrink eventually. Also we may replace `ctr`
with a library.

Fix #1029

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack
2017-01-24 15:39:44 +00:00
parent d4416e1b93
commit 89e98eefa0
14 changed files with 132 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
alpine/packages/Makefile
View File

@@ -1,4 +1,4 @@
DEPS=proxy diagnostics transfused tap-vsockd docker nc-vsock vsudd 9pmount-vsock iptables
DEPS=proxy diagnostics transfused tap-vsockd docker nc-vsock vsudd 9pmount-vsock iptables containerd
.PHONY: clean $(DEPS)
default: $(DEPS)

1
alpine/packages/containerd/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
usr

22
alpine/packages/containerd/Makefile Normal file
View File

@@ -0,0 +1,22 @@
# Tag: cd9f1788bb2e8e7a342f32dd8ba70f450ff7ae2c
CONTAINERD_IMAGE=mobylinux/containerd@sha256:96a96f60751a1bb762e285f36e0cf9c5b4126933bb91475b7369efc990539165
CONTAINERD_BINARIES=usr/bin/containerd usr/bin/containerd-shim usr/bin/ctr
# Tag: 1a72d872ae97b90ae52482e4cb33a2778e168358
RUNC_IMAGE=mobylinux/runc@sha256:2ea83d68baa57d547ec6d407d09cd495e4ef9cd6b0207ec3525fb2752b4a197e
RUNC_BINARY=usr/bin/runc
default: $(RUNC_BINARY) $(CONTAINERD_BINARIES)
$(RUNC_BINARY):
mkdir -p $(dir $@)
docker run --rm --net=none $(RUNC_IMAGE) tar cf - $@ | tar xf -
$(CONTAINERD_BINARIES):
mkdir -p $(dir $@)
docker run --rm --net=none $(CONTAINERD_IMAGE) tar cf - $@ | tar xf -
clean:
rm -rf usr
.DELETE_ON_ERROR:

2
alpine/packages/containerd/etc/init.d/containerd
View File

@@ -26,7 +26,7 @@ start()
for f in /containers/*
do
containerd-ctr containers start --no-pivot --attach "$(basename $f)" "$f" 2>$LOG >$LOG &
ctr run --bundle "$f" "$(basename $f)" 2>$LOG >$LOG &
printf " $(basename $f)"
done

2
alpine/packages/diagnostics/usr/bin/diagnostics
View File

@@ -41,7 +41,7 @@ DIAGNOSTICS=$(ps -eo args | grep '^/usr/bin/diagnostics-server')
[ $? -eq 0 ] && ok "Diagnostics server running: $DIAGNOSTICS\n" || fail "No diagnostics server\n"
CONTAINERD=$(ps -eo args | grep '^/usr/bin/containerd')
[ $? -eq 0 ] && ok "System containerd server running: $CONTAINERD\n" || fail "No containerd server\n"
CONTAINERPS=$(containerd-ctr containers 2>&1)
CONTAINERPS=$(ctr list 2>&1)
[ $? -eq 0 ] && ok "System containerd working\n" || fail "containerd failed: $CONTAINERPS\n"
exit $EXIT_STATUS

2
alpine/packages/test/etc/init.d/test
View File

@@ -11,7 +11,7 @@ start()
ebegin "Running tests"
if containerd-ctr containers start --no-pivot --attach test /test
if ctr run --bundle /test test
then
printf "Moby test suite PASSED\n"
else