docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13942 from calavera/fix_unshare_mount_regression 

Fix regression bind mounting shared.
This commit is contained in:
Michael Crosby 2015-06-15 11:25:35 -07:00
parent 1157fcc4a4 d8592eaff8
commit 3f11e05db2
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/init/openrc/docker.initd
View File

@ -7,7 +7,6 @@ DOCKER_LOGFILE=${DOCKER_LOGFILE:-/var/log/${SVCNAME}.log}
DOCKER_PIDFILE=${DOCKER_PIDFILE:-/run/${SVCNAME}.pid} DOCKER_PIDFILE=${DOCKER_PIDFILE:-/run/${SVCNAME}.pid}
DOCKER_BINARY=${DOCKER_BINARY:-/usr/bin/docker} DOCKER_BINARY=${DOCKER_BINARY:-/usr/bin/docker}
DOCKER_OPTS=${DOCKER_OPTS:-} DOCKER_OPTS=${DOCKER_OPTS:-}
UNSHARE_BINARY=${UNSHARE_BINARY:-/usr/bin/unshare}
start() { start() {
checkpath -f -m 0644 -o root:docker "$DOCKER_LOGFILE" checkpath -f -m 0644 -o root:docker "$DOCKER_LOGFILE"
@ -17,12 +16,11 @@ start() {
ebegin "Starting docker daemon" ebegin "Starting docker daemon"
start-stop-daemon --start --background \ start-stop-daemon --start --background \
--exec "$UNSHARE_BINARY" \ --exec "$DOCKER_BINARY" \
--pidfile "$DOCKER_PIDFILE" \ --pidfile "$DOCKER_PIDFILE" \
--stdout "$DOCKER_LOGFILE" \ --stdout "$DOCKER_LOGFILE" \
--stderr "$DOCKER_LOGFILE" \ --stderr "$DOCKER_LOGFILE" \
-- --mount \ -- -d -p "$DOCKER_PIDFILE" \
-- "$DOCKER_BINARY" -d -p "$DOCKER_PIDFILE" \
$DOCKER_OPTS $DOCKER_OPTS
eend $? eend $?
} }

7
contrib/init/sysvinit-debian/docker
View File

@ -30,7 +30,6 @@ DOCKER_SSD_PIDFILE=/var/run/$BASE-ssd.pid
DOCKER_LOGFILE=/var/log/$BASE.log DOCKER_LOGFILE=/var/log/$BASE.log
DOCKER_OPTS= DOCKER_OPTS=
DOCKER_DESC="Docker" DOCKER_DESC="Docker"
UNSHARE=${UNSHARE:-/usr/bin/unshare}
# Get lsb functions # Get lsb functions
. /lib/lsb/init-functions . /lib/lsb/init-functions
@ -104,11 +103,11 @@ case "$1" in
log_begin_msg "Starting $DOCKER_DESC: $BASE" log_begin_msg "Starting $DOCKER_DESC: $BASE"
start-stop-daemon --start --background \ start-stop-daemon --start --background \
--no-close \ --no-close \
--exec "$UNSHARE" \ --exec "$DOCKER" \
--pidfile "$DOCKER_SSD_PIDFILE" \ --pidfile "$DOCKER_SSD_PIDFILE" \
--make-pidfile \ --make-pidfile \
-- --mount \ -- \
-- "$DOCKER" -d -p "$DOCKER_PIDFILE" \ -d -p "$DOCKER_PIDFILE" \
$DOCKER_OPTS \ $DOCKER_OPTS \
>> "$DOCKER_LOGFILE" 2>&1 >> "$DOCKER_LOGFILE" 2>&1
log_end_msg $? log_end_msg $?

2
contrib/init/upstart/docker.conf
View File

@ -39,7 +39,7 @@ script
if [ -f /etc/default/$UPSTART_JOB ]; then if [ -f /etc/default/$UPSTART_JOB ]; then
. /etc/default/$UPSTART_JOB . /etc/default/$UPSTART_JOB
fi fi
exec unshare -m -- "$DOCKER" -d $DOCKER_OPTS exec "$DOCKER" -d $DOCKER_OPTS
end script end script
# Don't emit "started" event until docker.sock is ready. # Don't emit "started" event until docker.sock is ready.