From 0471467e64e54341fe523019c9d099301d086f97 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Sat, 20 Jul 2019 16:19:23 +0200
Subject: [PATCH] fix healthcheck and add cache dir setup

---
 docker-compose.yml                   | 3 ---
 overlay/usr/local/bin/entrypoint.sh  | 6 +++---
 overlay/usr/local/bin/healthcheck.sh | 1 +
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 15fef70..3fc7a7a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,9 +11,6 @@ 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 309bb91..a8cc27c 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 ed10222..67cbd61 100755
--- a/overlay/usr/local/bin/healthcheck.sh
+++ b/overlay/usr/local/bin/healthcheck.sh
@@ -9,6 +9,7 @@ wget --quiet --tries=1 --spider ${URL}
 CONTENT=$(wget --quiet -O - ${URL})
 case "$CONTENT" in
   *Exception*) exit 1 ;;
+  *alert-*alert-*SELF_URL_PATH*) exit 1 ;;
   *alert-*SELF_URL_PATH*alert-*) exit 1 ;;
   *SELF_URL_PATH*alert-*alert-*) exit 1 ;;
 esac