diff --git a/alpine/packages/diagnostics/diagnostics b/alpine/packages/diagnostics/diagnostics index a81acf6ff..da06ad584 100755 --- a/alpine/packages/diagnostics/diagnostics +++ b/alpine/packages/diagnostics/diagnostics @@ -12,7 +12,7 @@ INET=$(ifconfig eth0 2> /dev/null | grep 'inet addr') [ $? -eq 0 ] && printf "✓ Network connected: $INET\n" || printf "✗ No network connection\n" FUSE=$(ps -eo args | grep '^/sbin/transfused') [ $? -eq 0 ] && printf "✓ Process transfused running\n" || printf "✗ No transfused process\n" -if [ ! -d /sys/bus/vmbus ] +if [ -d /sys/bus/vmbus ] then TAPVS=$(ps -eo args | grep '^/sbin/tap-vsockd') [ $? -eq 0 ] && printf "✓ Process tap-vsockd running\n" || printf "✗ No tap-vsockd process\n" diff --git a/alpine/packages/docker/Makefile b/alpine/packages/docker/Makefile index 802a195be..54a5fe3fb 100644 --- a/alpine/packages/docker/Makefile +++ b/alpine/packages/docker/Makefile @@ -1,12 +1,13 @@ -DOCKER_VERSION=1.12-dev +DOCKER_VERSION=1.12.0-rc1 ARCH?=x86_64 OS?=Linux +EXPERIMENTAL?=1 all: bin bin: docker.git (cd docker.git && git fetch origin --tags && git checkout moby-$(DOCKER_VERSION)) - BIND_DIR=$(shell pwd) make -C docker.git binary + DOCKER_EXPERIMENTAL=$(EXPERIMENTAL) BIND_DIR=$(shell pwd) make -C docker.git binary mkdir -p bin cp docker.git/bundles/latest/binary-daemon/{dockerd,docker-runc} bin/ cp docker.git/bundles/latest/binary-daemon/{docker-containerd,docker-containerd-shim,docker-containerd-ctr} bin/