small fixes

CHANGELOG.md

@@ -1,2 +1,2 @@
-* FEATURE
-  * intial release
+* BUGFIX
+  * move healthcheck to wrapper script

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 []

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"

overlay/usr/local/bin/healthcheck.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+(php -r "readfile('http://localhost:8080/i/');" | grep -q 'jsonVars') || exit 1