diff --git a/dev-proxy/run.sh b/dev-proxy/run.sh index 80f3569..8cff39f 100755 --- a/dev-proxy/run.sh +++ b/dev-proxy/run.sh @@ -18,7 +18,7 @@ source ${SCRIPT_PATH}/../common.shinc source ${SCRIPT_PATH}/env.shinc 2> /dev/null init() { -# docker pull ${IMAGE_NAME}:${IMAGE_VERSION} || return $? + docker pull ${IMAGE_NAME}:${IMAGE_VERSION} || return $? NETWORKS=(${PROXY_NETWORK}) __createNetworks diff --git a/dev-proxy/src/Procfile b/dev-proxy/src/Procfile index 20e2131..a440f8c 100644 --- a/dev-proxy/src/Procfile +++ b/dev-proxy/src/Procfile @@ -1,2 +1,2 @@ -dockergen: docker-gen -watch -notify "pkill -USR1 caddy" -config /code/docker-gen/config/docker-gen.cfg -caddy: caddy --conf /etc/caddy/Caddyfile --log stdout \ No newline at end of file +dockergen: docker-gen -notify-output -config /code/docker-gen/config/docker-gen.cfg +caddy: caddy --conf /etc/caddy/Caddyfile --log stdout diff --git a/dev-proxy/src/docker-gen/config/docker-gen.cfg b/dev-proxy/src/docker-gen/config/docker-gen.cfg index 5b6d4ee..f0b9bed 100644 --- a/dev-proxy/src/docker-gen/config/docker-gen.cfg +++ b/dev-proxy/src/docker-gen/config/docker-gen.cfg @@ -4,3 +4,4 @@ dest = "/etc/caddy/Caddyfile" onlyexposed = false watch = true wait = "500ms:2s" +notifycmd = "pkill -USR1 caddy"