github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 18:11:35 +00:00
Code Issues Projects Releases Wiki Activity

Support for 1.11.0-rc2, fix #57

Browse Source 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2016-03-29 22:34:58 +01:00
parent 1947dc4e19
commit a187d2e5f4
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
alpine/Dockerfile
View File

@ -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/

2
alpine/packages/diagnostics/diagnostics
View File

@ -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$')

1
alpine/packages/docker/.gitignore vendored
View File

@ -1 +1,2 @@
docker
docker-*

8
alpine/packages/docker/Makefile
View File

@ -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