From fa4beb527754c05ede0a346578a45973dd179ea7 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Wed, 30 Dec 2015 21:04:43 +0000 Subject: [PATCH] remove /etc/conf.d.docker will provide option to have that externally to override Signed-off-by: Justin Cormack --- alpine/packages/docker/etc/conf.d/docker | 5 ----- alpine/packages/docker/etc/init.d/docker | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 alpine/packages/docker/etc/conf.d/docker diff --git a/alpine/packages/docker/etc/conf.d/docker b/alpine/packages/docker/etc/conf.d/docker deleted file mode 100644 index c77f18fb2..000000000 --- a/alpine/packages/docker/etc/conf.d/docker +++ /dev/null @@ -1,5 +0,0 @@ -# /etc/conf.d/docker - -export DOCKER_RAMDISK="true" -export DOCKER_BINARY="/usr/bin/docker" -export DOCKER_OPTS="-s aufs" diff --git a/alpine/packages/docker/etc/init.d/docker b/alpine/packages/docker/etc/init.d/docker index 1e90b4568..cbdc170d5 100755 --- a/alpine/packages/docker/etc/init.d/docker +++ b/alpine/packages/docker/etc/init.d/docker @@ -1,5 +1,8 @@ #!/sbin/openrc-run +export DOCKER_RAMDISK="true" + +DOCKER_OPTS="${DOCKER_OPTS:--s aufs}" command="${DOCKER_BINARY:-/usr/bin/docker}" pidfile="${DOCKER_PIDFILE:-/run/${RC_SVCNAME}.pid}" command_args="daemon -p \"${pidfile}\" ${DOCKER_OPTS}"