From 20ec435d6dd80a5a7aed8be3c47103588ac25714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= Date: Mon, 22 Feb 2021 21:47:30 -0800 Subject: [PATCH] Move healthcheck from Dockerfile to docker-compose because it's optional --- contrib/docker-compose/basic.yml | 3 +++ packaging/docker/Dockerfile | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/docker-compose/basic.yml b/contrib/docker-compose/basic.yml index a90f01e6..e4ce55ca 100644 --- a/contrib/docker-compose/basic.yml +++ b/contrib/docker-compose/basic.yml @@ -16,6 +16,9 @@ services: - ADMIN_USERNAME=admin - ADMIN_PASSWORD=test123 - DEBUG=1 + # Optional health check: + # healthcheck: + # test: ["CMD", "/usr/bin/miniflux", "-healthcheck", "auto"] db: image: postgres:latest container_name: postgres diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index 0653e362..040b085b 100644 --- a/packaging/docker/Dockerfile +++ b/packaging/docker/Dockerfile @@ -20,7 +20,6 @@ LABEL org.opencontainers.image.documentation=https://miniflux.app/docs/ EXPOSE 8080 ENV LISTEN_ADDR 0.0.0.0:8080 -HEALTHCHECK --start-period=30s CMD ["/usr/bin/miniflux", "-healthcheck", "auto"] RUN apk --no-cache add ca-certificates tzdata COPY --from=build /go/src/app/miniflux /usr/bin/miniflux USER nobody