From 774d10931f48bcb795d0487bb4c2c4dc34d664fb Mon Sep 17 00:00:00 2001 From: Simon L Date: Fri, 18 Aug 2023 21:20:00 +0200 Subject: [PATCH 1/2] nextcloud - improve healthcheck Signed-off-by: Simon L Revert "nextcloud - improve healthcheck" This reverts commit d9352c36d3c902c8ab2e884513cd1ba331bac78b. Update Dockerfile --- Containers/nextcloud/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containers/nextcloud/Dockerfile b/Containers/nextcloud/Dockerfile index e64e808e..5ebba236 100644 --- a/Containers/nextcloud/Dockerfile +++ b/Containers/nextcloud/Dockerfile @@ -223,5 +223,5 @@ USER root ENTRYPOINT ["/start.sh"] CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"] -HEALTHCHECK CMD sudo -E -u www-data bash /healthcheck.sh +HEALTHCHECK --start-period=60s CMD sudo -E -u www-data bash /healthcheck.sh LABEL com.centurylinklabs.watchtower.enable="false" From 6f517955d404cebda84439105747d8bb9a896df6 Mon Sep 17 00:00:00 2001 From: Simon L Date: Sat, 19 Aug 2023 10:25:23 +0200 Subject: [PATCH 2/2] fix docker-lint workflow Signed-off-by: Simon L --- .github/workflows/docker-lint.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-lint.yml b/.github/workflows/docker-lint.yml index cae8fa69..8e5c5903 100644 --- a/.github/workflows/docker-lint.yml +++ b/.github/workflows/docker-lint.yml @@ -32,10 +32,10 @@ jobs: sudo apt-get update sudo apt-get install nodejs npm -y --no-install-recommends npm install -g dockerfilelint - wget https://github.com/replicatedhq/dockerfilelint/pull/184.patch -O /usr/local/lib/node_modules/dockerfilelint/184.patch + wget https://github.com/replicatedhq/dockerfilelint/pull/201.patch -O /usr/local/lib/node_modules/dockerfilelint/201.patch CURRENT_DIR=$PWD cd /usr/local/lib/node_modules/dockerfilelint/ - git apply 184.patch + git apply 201.patch cd $CURRENT_DIR cat << RULES > ./.dockerfilelintrc rules: