From 7b33ea49bb262128aafea5931259db4293ee42d2 Mon Sep 17 00:00:00 2001
From: Justin Cormack <justin.cormack@unikernel.com>
Date: Mon, 4 Jan 2016 12:19:03 +0000
Subject: [PATCH] replace docker-x binary with a script that downloads on
 demand

Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
---
 alpine/Dockerfile                        | 2 +-
 alpine/packages/Makefile                 | 2 --
 alpine/packages/docker-x/.gitignore      | 1 -
 alpine/packages/docker-x/Makefile        | 8 --------
 alpine/packages/docker-x/get-docker-x    | 6 ++++++
 alpine/packages/docker/etc/init.d/docker | 3 +++
 6 files changed, 10 insertions(+), 12 deletions(-)
 delete mode 100644 alpine/packages/docker-x/.gitignore
 delete mode 100644 alpine/packages/docker-x/Makefile
 create mode 100755 alpine/packages/docker-x/get-docker-x

diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index e0db803da..da781f111 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -27,7 +27,7 @@ COPY packages/mdnstool/mdnstool /sbin/
 COPY packages/mdnstool/etc /etc/
 COPY packages/docker/docker /usr/bin/
 COPY packages/docker/etc /etc/
-#COPY packages/docker-x/docker-x /usr/bin/
+COPY packages/docker-x/get-docker-x /usr/bin/
 COPY packages/diagnostics/diagnostics /usr/bin/
 COPY packages/diagnostics/etc /etc/
 COPY packages/automount/etc /etc/
diff --git a/alpine/packages/Makefile b/alpine/packages/Makefile
index 202d8113f..28c9ee6b2 100644
--- a/alpine/packages/Makefile
+++ b/alpine/packages/Makefile
@@ -2,10 +2,8 @@ all:
 	$(MAKE) -C 9pudc
 	$(MAKE) -C mdnstool
 	$(MAKE) -C docker
-	$(MAKE) -C docker-x
 
 clean:
 	$(MAKE) -C 9pudc clean
 	$(MAKE) -C mdnstool clean
 	$(MAKE) -C docker clean
-	$(MAKE) -C docker-x clean
diff --git a/alpine/packages/docker-x/.gitignore b/alpine/packages/docker-x/.gitignore
deleted file mode 100644
index 6900f29c3..000000000
--- a/alpine/packages/docker-x/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-docker-x
diff --git a/alpine/packages/docker-x/Makefile b/alpine/packages/docker-x/Makefile
deleted file mode 100644
index fa8317010..000000000
--- a/alpine/packages/docker-x/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-all: docker-x
-
-docker-x:
-	curl -L https://experimental.docker.com/builds/Linux/x86_64/docker-latest > docker-x
-	chmod +x docker-x
-
-clean:
-	rm -f docker-x
diff --git a/alpine/packages/docker-x/get-docker-x b/alpine/packages/docker-x/get-docker-x
new file mode 100755
index 000000000..7954b511a
--- /dev/null
+++ b/alpine/packages/docker-x/get-docker-x
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+OS=$(uname -s)
+ARCH=$(uname -m)
+
+curl -L https://experimental.docker.com/builds/${OS}/${ARCH}/docker-latest > /usr/bin/docker-x && chmod +x /usr/bin/docker-x
diff --git a/alpine/packages/docker/etc/init.d/docker b/alpine/packages/docker/etc/init.d/docker
index cbdc170d5..7542b60dc 100755
--- a/alpine/packages/docker/etc/init.d/docker
+++ b/alpine/packages/docker/etc/init.d/docker
@@ -4,6 +4,9 @@ export DOCKER_RAMDISK="true"
 
 DOCKER_OPTS="${DOCKER_OPTS:--s aufs}"
 command="${DOCKER_BINARY:-/usr/bin/docker}"
+
+[ ! -f ${DOCKER_BINARY} ] && [ "${DOCKER_BINARY}" = "/usr/bin/docker-x" ] && get-docker-x
+
 pidfile="${DOCKER_PIDFILE:-/run/${RC_SVCNAME}.pid}"
 command_args="daemon -p \"${pidfile}\" ${DOCKER_OPTS}"
 DOCKER_LOGFILE="${DOCKER_LOGFILE:-/var/log/${RC_SVCNAME}.log}"