Merge branch 'master' into merge/master-into-dev

This commit is contained in:
Kristian Haugene
2020-10-10 14:04:31 +02:00
7 changed files with 36 additions and 3 deletions

View File

@@ -53,6 +53,7 @@ ENV OPENVPN_USERNAME=**None** \
WEBPROXY_USERNAME= \
WEBPROXY_PASSWORD= \
DOCKER_LOG=false \
LOG_TO_STDOUT=false \
HEALTH_CHECK_HOST=google.com
HEALTHCHECK --interval=1m CMD /etc/scripts/healthcheck.sh