From 578e5d22961990558cf9abe2eb3d5b101c023456 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 20 Jul 2019 15:56:15 +0200 Subject: [PATCH] debug healthcheck script --- docker-compose.yml | 3 +++ overlay/usr/local/bin/entrypoint.sh | 6 +++--- overlay/usr/local/bin/healthcheck.sh | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3fc7a7a..15fef70 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,6 +11,9 @@ services: - plugins:/var/www/app/plugins.local - icons:/var/www/app/feed-icons - themes:/var/www/app/themes.local + tmpfs: + - /var/www/app/cache + - /var/www/app/lock db: image: postgres diff --git a/overlay/usr/local/bin/entrypoint.sh b/overlay/usr/local/bin/entrypoint.sh index a8cc27c..309bb91 100755 --- a/overlay/usr/local/bin/entrypoint.sh +++ b/overlay/usr/local/bin/entrypoint.sh @@ -3,9 +3,9 @@ /usr/local/bin/gomplate -V -o /var/www/app/config.php -f /etc/templates/config.php.tmpl # ensure lock folders exists -mkdir -p /var/www/app/cache/images -mkdir -p /var/www/app/cache/upload -mkdir -p /var/www/app/cache/export +#mkdir -p /var/www/app/cache/images +#mkdir -p /var/www/app/cache/upload +#mkdir -p /var/www/app/cache/export chown -R nginx:nginx /var/www/app/lock chown -R nginx:nginx /var/www/app/cache diff --git a/overlay/usr/local/bin/healthcheck.sh b/overlay/usr/local/bin/healthcheck.sh index db3c94d..ed10222 100755 --- a/overlay/usr/local/bin/healthcheck.sh +++ b/overlay/usr/local/bin/healthcheck.sh @@ -9,7 +9,8 @@ wget --quiet --tries=1 --spider ${URL} CONTENT=$(wget --quiet -O - ${URL}) case "$CONTENT" in *Exception*) exit 1 ;; - *misconfiguration*) exit 1 ;; + *alert-*SELF_URL_PATH*alert-*) exit 1 ;; + *SELF_URL_PATH*alert-*alert-*) exit 1 ;; esac exit 0