diff options
Diffstat (limited to 'system')
| -rw-r--r-- | system/docker/config/rc.docker | 3 | ||||
| -rw-r--r-- | system/docker/docker.SlackBuild | 4 | ||||
| -rw-r--r-- | system/docker/docker.info | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/system/docker/config/rc.docker b/system/docker/config/rc.docker index bf6e183e4cc81..0199623116099 100644 --- a/system/docker/config/rc.docker +++ b/system/docker/config/rc.docker @@ -12,6 +12,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin BASE=docker +UNSHARE=/usr/bin/unshare DOCKER=/usr/bin/$BASE DOCKER_PIDFILE=/var/run/$BASE.pid DOCKER_LOG=/var/log/docker.log @@ -37,7 +38,7 @@ docker_start() { rm -f ${DOCKER_PIDFILE} fi fi - nohup ${DOCKER} -d -p ${DOCKER_PIDFILE} ${DOCKER_OPTS} >> ${DOCKER_LOG} 2>&1 & + nohup "${UNSHARE}" -m -- ${DOCKER} -d -p ${DOCKER_PIDFILE} ${DOCKER_OPTS} >> ${DOCKER_LOG} 2>&1 & fi } diff --git a/system/docker/docker.SlackBuild b/system/docker/docker.SlackBuild index 116ef5aa60912..6f2084a58ff06 100644 --- a/system/docker/docker.SlackBuild +++ b/system/docker/docker.SlackBuild @@ -5,11 +5,11 @@ # Written by Vincent Batts <vbatts@hashbangbash.com> PRGNAM=docker -VERSION=${VERSION:-1.3.1} +VERSION=${VERSION:-1.4.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -GITHASH=${GITHASH:-4e9bbfa} +GITHASH=${GITHASH:-5bc2ff8} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/system/docker/docker.info b/system/docker/docker.info index 9039305b56d8b..5e905626a69d8 100644 --- a/system/docker/docker.info +++ b/system/docker/docker.info @@ -1,10 +1,10 @@ PRGNAM="docker" -VERSION="1.3.1" +VERSION="1.4.1" HOMEPAGE="https://docker.io/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/docker/docker/archive/v1.3.1.tar.gz" -MD5SUM_x86_64="098c366f9c8eb82ba537b93eec66303e" +DOWNLOAD_x86_64="https://github.com/docker/docker/archive/v1.4.1.tar.gz" +MD5SUM_x86_64="70068f2f59e8d4241ca344dcacdd2058" REQUIRES="google-go-lang" MAINTAINER="Vincent Batts" EMAIL="vbatts@hashbangbash.com" |