Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
| ... | ... |
@@ -1,8 +1,18 @@ |
| 1 | 1 |
# /etc/conf.d/docker: config file for /etc/init.d/docker |
| 2 | 2 |
|
| 3 | 3 |
# where the docker daemon output gets piped |
| 4 |
+# this contains both stdout and stderr. If you need to separate them, |
|
| 5 |
+# see the settings below |
|
| 4 | 6 |
#DOCKER_LOGFILE="/var/log/docker.log" |
| 5 | 7 |
|
| 8 |
+# where the docker daemon stdout gets piped |
|
| 9 |
+# if this is not set, DOCKER_LOGFILE is used |
|
| 10 |
+#DOCKER_OUTFILE="/var/log/docker-out.log" |
|
| 11 |
+ |
|
| 12 |
+# where the docker daemon stderr gets piped |
|
| 13 |
+# if this is not set, DOCKER_LOGFILE is used |
|
| 14 |
+#DOCKER_ERRFILE="/var/log/docker-err.log" |
|
| 15 |
+ |
|
| 6 | 16 |
# where docker's pid get stored |
| 7 | 17 |
#DOCKER_PIDFILE="/run/docker.pid" |
| 8 | 18 |
|
| ... | ... |
@@ -6,8 +6,10 @@ command="${DOCKERD_BINARY:-/usr/bin/dockerd}"
|
| 6 | 6 |
pidfile="${DOCKER_PIDFILE:-/run/${RC_SVCNAME}.pid}"
|
| 7 | 7 |
command_args="-p \"${pidfile}\" ${DOCKER_OPTS}"
|
| 8 | 8 |
DOCKER_LOGFILE="${DOCKER_LOGFILE:-/var/log/${RC_SVCNAME}.log}"
|
| 9 |
+DOCKER_ERRFILE="${DOCKER_ERRFILE:-${DOCKER_LOGFILE}}"
|
|
| 10 |
+DOCKER_OUTFILE="${DOCKER_OUTFILE:-${DOCKER_LOGFILE}}"
|
|
| 9 | 11 |
start_stop_daemon_args="--background \ |
| 10 |
- --stderr \"${DOCKER_LOGFILE}\" --stdout \"${DOCKER_LOGFILE}\""
|
|
| 12 |
+ --stderr \"${DOCKER_ERRFILE}\" --stdout \"${DOCKER_OUTFILE}\""
|
|
| 11 | 13 |
|
| 12 | 14 |
start_pre() {
|
| 13 | 15 |
checkpath -f -m 0644 -o root:docker "$DOCKER_LOGFILE" |