Merge branch 'fixl-add-health-check-to-alpine-and-armhf' into dev

This commit is contained in:
Kristian Haugene
2020-03-29 15:24:50 +02:00
2 changed files with 9 additions and 2 deletions

View File

@@ -29,6 +29,7 @@ RUN echo "@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/ap
ADD openvpn/ /etc/openvpn/
ADD transmission/ /etc/transmission/
ADD scripts /etc/scripts/
ENV OPENVPN_USERNAME=**None** \
OPENVPN_PASSWORD=**None** \
@@ -120,7 +121,10 @@ ENV OPENVPN_USERNAME=**None** \
DROP_DEFAULT_ROUTE= \
WEBPROXY_ENABLED=false \
WEBPROXY_PORT=8888 \
DOCKER_LOG=false
DOCKER_LOG=false \
HEALTH_CHECK_HOST=google.com
HEALTHCHECK --interval=5m CMD /etc/scripts/healthcheck.sh
# Expose port and run
EXPOSE 9091

View File

@@ -127,7 +127,10 @@ ENV OPENVPN_USERNAME=**None** \
DROP_DEFAULT_ROUTE= \
WEBPROXY_ENABLED=false \
WEBPROXY_PORT=8888 \
DOCKER_LOG=false
DOCKER_LOG=false \
HEALTH_CHECK_HOST=google.com
HEALTHCHECK --interval=5m CMD /etc/scripts/healthcheck.sh
# Expose port and run
EXPOSE 9091