From 1d03f5011d700a54345bed48acf729e6f70395ce Mon Sep 17 00:00:00 2001
From: Justin Cormack <justin.cormack@unikernel.com>
Date: Fri, 8 Jan 2016 15:16:48 +0000
Subject: [PATCH] simplify the docker-x install process

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

diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index 1a5d38338..b2d9d03f9 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -30,7 +30,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/get-docker-x /usr/bin/
+COPY packages/docker-x/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/docker-x/docker-x b/alpine/packages/docker-x/docker-x
new file mode 100755
index 000000000..fb05a41da
--- /dev/null
+++ b/alpine/packages/docker-x/docker-x
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+OS=$(uname -s)
+ARCH=$(uname -m)
+
+curl -L https://experimental.docker.com/builds/${OS}/${ARCH}/docker-latest > /tmp/docker-x || (printf "failed to download docker-x" && exit 1)
+
+chmod +x /tmp/docker-x
+
+mv /tmp/docker-x /usr/bin/docker-x
+
+exec /usr/bin/docker-x $*
diff --git a/alpine/packages/docker-x/get-docker-x b/alpine/packages/docker-x/get-docker-x
deleted file mode 100755
index 7954b511a..000000000
--- a/alpine/packages/docker-x/get-docker-x
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/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 7542b60dc..4d99ab4aa 100755
--- a/alpine/packages/docker/etc/init.d/docker
+++ b/alpine/packages/docker/etc/init.d/docker
@@ -5,8 +5,6 @@ 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}"