kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #14865 from calavera/update_init_scripts

Browse source 
Update init scripts to use `docker daemon`.
This commit is contained in:
Tianon Gravi 2015-07-24 09:47:03 -07:00
commit 4eee075f22
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/init/openrc/docker.initd
View file

@ -20,7 +20,7 @@ start() {
--pidfile "$DOCKER_PIDFILE" \ --pidfile "$DOCKER_PIDFILE" \
--stdout "$DOCKER_LOGFILE" \ --stdout "$DOCKER_LOGFILE" \
--stderr "$DOCKER_LOGFILE" \ --stderr "$DOCKER_LOGFILE" \
-- -d -p "$DOCKER_PIDFILE" \ -- daemon -p "$DOCKER_PIDFILE" \
$DOCKER_OPTS $DOCKER_OPTS
eend $? eend $?
} }

2
contrib/init/systemd/docker.service
View file

@ -5,7 +5,7 @@ After=network.target docker.socket
Requires=docker.socket Requires=docker.socket
[Service] [Service]
ExecStart=/usr/bin/docker -d -H fd:// ExecStart=/usr/bin/docker daemon -H fd://
MountFlags=slave MountFlags=slave
LimitNOFILE=1048576 LimitNOFILE=1048576
LimitNPROC=1048576 LimitNPROC=1048576

2
contrib/init/sysvinit-debian/docker
View file

@ -107,7 +107,7 @@ case "$1" in
--pidfile "$DOCKER_SSD_PIDFILE" \ --pidfile "$DOCKER_SSD_PIDFILE" \
--make-pidfile \ --make-pidfile \
-- \ -- \
-d -p "$DOCKER_PIDFILE" \ daemon -p "$DOCKER_PIDFILE" \
$DOCKER_OPTS \ $DOCKER_OPTS \
>> "$DOCKER_LOGFILE" 2>&1 >> "$DOCKER_LOGFILE" 2>&1
log_end_msg $? log_end_msg $?

2
contrib/init/sysvinit-redhat/docker
View file

@ -49,7 +49,7 @@ start() {
prestart prestart
printf "Starting $prog:\t" printf "Starting $prog:\t"
echo "\n$(date)\n" >> $logfile echo "\n$(date)\n" >> $logfile
"$unshare" -m -- $exec -d $other_args &>> $logfile & "$unshare" -m -- $exec daemon $other_args &>> $logfile &
pid=$! pid=$!
touch $lockfile touch $lockfile
# wait up to 10 seconds for the pidfile to exist. see # wait up to 10 seconds for the pidfile to exist. see

2
contrib/init/sysvinit-redhat/docker.sysconfig
View file

@ -2,6 +2,6 @@
# #
# Other arguments to pass to the docker daemon process # Other arguments to pass to the docker daemon process
# These will be parsed by the sysv initscript and appended # These will be parsed by the sysv initscript and appended
# to the arguments list passed to docker -d # to the arguments list passed to docker daemon
other_args="" other_args=""

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 "$DOCKER" -d $DOCKER_OPTS exec "$DOCKER" daemon $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.