github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-31 06:32:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #136 from dave-tucker/proxy_2

Browse Source 
Only watch proxy if keys are in the db
This commit is contained in:
Justin Cormack 2016-05-18 07:47:44 -05:00
commit db0ddaa84e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
alpine/packages/hupper/etc/init.d/hupper
View File

@ -14,17 +14,17 @@ start()
PIDFILE=/run/hupper.pid PIDFILE=/run/hupper.pid
DOCKERPIDFILE=/run/docker.pid DOCKERPIDFILE=/run/docker.pid
WATCH_CONFIG=$(mobyconfig watch /etc/docker/daemon.json) WATCH_CONFIG=$(mobyconfig watch /etc/docker/daemon.json)
WATCH_PROXY=$(mobyconfig watch proxy) WATCH_PROXY=""
PROXY="$(mobyconfig watch proxy)"
[ -n "${PROXY}" ] && WATCH_PROXY="-path ${PROXY}"
[ -z "${WATCH_CONFIG}" ] && exit 1 [ -z "${WATCH_CONFIG}" ] && exit 1
[ -z "${WATCH_PROXY}" ] && exit 1
start-stop-daemon --start --quiet \ start-stop-daemon --start --quiet \
--background \ --background \
--exec /bin/hupper \ --exec /bin/hupper \
--make-pidfile --pidfile ${PIDFILE} \ --make-pidfile --pidfile ${PIDFILE} \
-- -pidfile ${PIDFILE} -huppidfile ${DOCKERPIDFILE} \ -- -pidfile ${PIDFILE} -huppidfile ${DOCKERPIDFILE} \
-path ${WATCH_CONFIG} -path ${WATCH_PROXY} -path ${WATCH_CONFIG} ${WATCH_PROXY}
eend $? "Failed to start hupper" eend $? "Failed to start hupper"
} }