diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 21665810b..252401be1 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -31,6 +31,7 @@ COPY packages/transfused/etc /etc/ COPY packages/mdnstool/mdnstool /sbin/ COPY packages/mdnstool/etc /etc/ COPY packages/docker/docker /usr/bin/ +COPY packages/docker/docker-* /usr/bin/ COPY packages/docker/etc /etc/ COPY packages/docker-x/docker-x /usr/bin/ COPY packages/diagnostics/diagnostics /usr/bin/ diff --git a/alpine/packages/diagnostics/diagnostics b/alpine/packages/diagnostics/diagnostics index 4b0598e06..1dc42cb50 100755 --- a/alpine/packages/diagnostics/diagnostics +++ b/alpine/packages/diagnostics/diagnostics @@ -20,6 +20,8 @@ HUPPER=$(ps -eo args | grep '^/bin/hupper') [ $? -eq 0 ] && printf "✓ Process hupper running: $HUPPER\n" || printf "✗ No hupper process\n" DOCKER=$(ps -eo args | grep '^/usr/bin/docker') [ $? -eq 0 ] && printf "✓ Process docker running: $DOCKER\n" || printf "✗ No docker process\n" +CONTAINERD=$(ps -eo args | grep '^docker-containerd') +[ $? -eq 0 ] && printf "✓ Process containerd running: $CONTAINERD\n" || printf "✗ No containerd process\n" DOCKERPS=$(docker ps 2>&1) [ $? -eq 0 ] && printf "✓ Docker daemon working\n" || printf "✗ Docker ps failed: $DOCKERPS\n" DIAGNOSTICS=$(ps -eo args | grep '/usr/bin/diagnostics-server$') diff --git a/alpine/packages/docker/.gitignore b/alpine/packages/docker/.gitignore index bdb967096..37af952a7 100644 --- a/alpine/packages/docker/.gitignore +++ b/alpine/packages/docker/.gitignore @@ -1 +1,2 @@ docker +docker-* diff --git a/alpine/packages/docker/Makefile b/alpine/packages/docker/Makefile index ff073ae1b..1d879db33 100644 --- a/alpine/packages/docker/Makefile +++ b/alpine/packages/docker/Makefile @@ -1,13 +1,13 @@ all: docker -DOCKER_VERSION=1.10.3 +DOCKER_VERSION=1.11.0-rc2 ARCH?=x86_64 OS?=Linux DOCKER_HOST=$(shell if echo "$(DOCKER_VERSION)" | grep -q -- '-rc'; then echo "test.docker.com"; else echo "get.docker.com"; fi) docker: - if [ "${ARCH}" != "arm" ] ; then curl -f -L -o docker https://${DOCKER_HOST}/builds/${OS}/${ARCH}/docker-${DOCKER_VERSION} ; else cp docker-arm docker; fi - chmod +x docker + if [ "${ARCH}" != "arm" ] ; then curl -f -L -o docker.tgz https://${DOCKER_HOST}/builds/${OS}/${ARCH}/docker-${DOCKER_VERSION}.tgz && tar xjf docker.tgz && mv usr/local/bin/* . && rm -rf usr/ docker.tgz; else cp docker-arm docker; fi + chmod +x docker docker-containerd docker-containerd-ctr docker-containerd-shim docker-runc clean: - rm -f docker + rm -f docker docker-containerd docker-containerd-ctr docker-containerd-shim docker-runc