github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 09:16:29 +00:00
Code Issues Projects Releases Wiki Activity

simplify the docker-x install process

Browse Source 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
This commit is contained in:
Justin Cormack 2016-01-08 15:16:48 +00:00
parent 0ea60c4f23
commit 1d03f5011d
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
alpine/Dockerfile
View File

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

12
alpine/packages/docker-x/docker-x Executable file
View File

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

6
alpine/packages/docker-x/get-docker-x
View File

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

2
alpine/packages/docker/etc/init.d/docker
View File

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