From 827eefcfa261de190e7866932120aa629e16dce3 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Wed, 15 Jun 2016 10:19:31 +0100 Subject: [PATCH 1/3] update docker to 1.12.0-rc1 Signed-off-by: Justin Cormack --- alpine/packages/docker/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/packages/docker/Makefile b/alpine/packages/docker/Makefile index 802a195be..c502e7db2 100644 --- a/alpine/packages/docker/Makefile +++ b/alpine/packages/docker/Makefile @@ -1,4 +1,4 @@ -DOCKER_VERSION=1.12-dev +DOCKER_VERSION=1.12.0-rc1 ARCH?=x86_64 OS?=Linux From 863fa5cb8e2570a628335513dd161840594d607a Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Wed, 15 Jun 2016 10:28:26 +0100 Subject: [PATCH 2/3] default to Docker experimental; later we will need to do multiple builds Signed-off-by: Justin Cormack --- alpine/packages/docker/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/alpine/packages/docker/Makefile b/alpine/packages/docker/Makefile index c502e7db2..54a5fe3fb 100644 --- a/alpine/packages/docker/Makefile +++ b/alpine/packages/docker/Makefile @@ -1,12 +1,13 @@ 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/ From 5b7c05c25b3dacf553bd637b5440427c1c3e3c1b Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Wed, 15 Jun 2016 10:42:21 +0100 Subject: [PATCH 3/3] reverse on Windows check for diagnostics Signed-off-by: Justin Cormack --- alpine/packages/diagnostics/diagnostics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"