浏览代码

Remove healthchecks and mention how to optin to them in docs

Jamie Curnow 4 年之前
父节点
当前提交
6a6c2ef192
共有 3 个文件被更改,包括 13 次插入2 次删除
  1. 0 1
      docker/Dockerfile
  2. 1 1
      docker/dev/Dockerfile
  3. 12 0
      docs/advanced-config/README.md

+ 0 - 1
docker/Dockerfile

@@ -48,7 +48,6 @@ RUN chmod 644 /etc/logrotate.d/nginx-proxy-manager
 
 VOLUME [ "/data", "/etc/letsencrypt" ]
 ENTRYPOINT [ "/init" ]
-HEALTHCHECK --interval=5s --timeout=3s CMD /bin/check-health
 
 LABEL org.label-schema.schema-version="1.0" \
 	org.label-schema.license="MIT" \

+ 1 - 1
docker/dev/Dockerfile

@@ -26,4 +26,4 @@ RUN curl -L -o /tmp/s6-overlay-amd64.tar.gz "https://github.com/just-containers/
 
 EXPOSE 80 81 443
 ENTRYPOINT [ "/init" ]
-HEALTHCHECK --interval=5s --timeout=3s CMD /bin/check-health
+

+ 12 - 0
docs/advanced-config/README.md

@@ -48,6 +48,18 @@ file, it's "exposed" by the portainer docker image for you and not available on
 the docker host outside of this docker network. The service name is used as the
 hostname, so make sure your service names are unique when using the same network.
 
+## Docker Healthcheck
+
+The `Dockerfile` that builds this project does not include a `HEALTCHECK` but you can opt in to this
+feature by adding the following to the service in your `docker-compose.yml` file:
+
+```yml
+healthcheck:
+  test: ["CMD", "/bin/check-health"]
+  interval: 10s
+  timeout: 3s
+```
+
 ## Docker Secrets
 
 This image supports the use of Docker secrets to import from file and keep sensitive usernames or passwords from being passed or preserved in plaintext.