From 4b45ce02ba121b03b2ad756b967d61e8e4b9de2a Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Wed, 2 Oct 2019 23:46:40 +0200
Subject: [PATCH] small fixes

---
 CHANGELOG.md                         | 4 ++--
 Dockerfile.linux.amd64               | 3 +--
 README.md                            | 6 +++---
 overlay/usr/local/bin/healthcheck.sh | 3 +++
 4 files changed, 9 insertions(+), 7 deletions(-)
 create mode 100755 overlay/usr/local/bin/healthcheck.sh

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f236963..7c7b2f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,2 +1,2 @@
-* FEATURE
-  * intial release
+* BUGFIX
+  * move healthcheck to wrapper script
diff --git a/Dockerfile.linux.amd64 b/Dockerfile.linux.amd64
index d4eb488..a1d815e 100644
--- a/Dockerfile.linux.amd64
+++ b/Dockerfile.linux.amd64
@@ -44,7 +44,6 @@ USER nginx
 STOPSIGNAL SIGTERM
 
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-HEALTHCHECK --interval=30s --timeout=5s --retries=3 \
-	CMD (php -r "readfile('http://localhost:8080/i/');" | grep -q 'jsonVars') || exit 1
+HEALTHCHECK --interval=30s --timeout=5s --retries=3 CMD /usr/local/bin/healthcheck.sh
 WORKDIR /var/www/app
 CMD []
diff --git a/README.md b/README.md
index 42d077d..bd786e4 100644
--- a/README.md
+++ b/README.md
@@ -58,8 +58,8 @@ volumes:
 
 ```Shell
 FRESHRSS_ENVIRONMENT="production"
-FRESHRSS_DEFAULT_USER: "admin"
-FRESHRSS_DEFAULT_PASSWORD: "freshrss"
+FRESHRSS_DEFAULT_USER="admin"
+FRESHRSS_DEFAULT_PASSWORD="freshrss"
 # Salt is used to make crypto more unique.
 # Can be generated with e.g. cat /proc/sys/kernel/random/uuid | sha1sum | awk '{print $1}'
 FRESHRSS_SALT=
@@ -68,7 +68,7 @@ FRESHRSS_SALT=
 FRESHRSS_BASE_URL="http://localhost/"
 FRESHRSS_LANGUAGE="en"
 FRESHRSS_TITLE="FreshRSS"
-FRESHRSS_META_DESCRIPTION
+FRESHRSS_META_DESCRIPTION=
 FRESHRSS_DEFAULT_USER="_"
 FRESHRSS_ALLOW_ANONYMOUS="false"
 FRESHRSS_ALLOW_ANONYMOUS_REFRESH="false"
diff --git a/overlay/usr/local/bin/healthcheck.sh b/overlay/usr/local/bin/healthcheck.sh
new file mode 100755
index 0000000..4eb04b5
--- /dev/null
+++ b/overlay/usr/local/bin/healthcheck.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+(php -r "readfile('http://localhost:8080/i/');" | grep -q 'jsonVars') || exit 1