container
/
freshrss
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 36 Activity

small fixes
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/tag Build is running Details

This commit is contained in:
Robert Kaussow 2019-10-02 23:46:40 +02:00
parent c16322500a
commit 4b45ce02ba
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

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

3
Dockerfile.linux.amd64
View File

@ -44,7 +44,6 @@ USER nginx
STOPSIGNAL SIGTERM STOPSIGNAL SIGTERM
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
HEALTHCHECK --interval=30s --timeout=5s --retries=3 \ HEALTHCHECK --interval=30s --timeout=5s --retries=3 CMD /usr/local/bin/healthcheck.sh
CMD (php -r "readfile('http://localhost:8080/i/');" | grep -q 'jsonVars') || exit 1
WORKDIR /var/www/app WORKDIR /var/www/app
CMD [] CMD []

6
README.md
View File

@ -58,8 +58,8 @@ volumes:
```Shell ```Shell
FRESHRSS_ENVIRONMENT="production" FRESHRSS_ENVIRONMENT="production"
FRESHRSS_DEFAULT_USER: "admin" FRESHRSS_DEFAULT_USER="admin"
FRESHRSS_DEFAULT_PASSWORD: "freshrss" FRESHRSS_DEFAULT_PASSWORD="freshrss"
# Salt is used to make crypto more unique. # Salt is used to make crypto more unique.
# Can be generated with e.g. cat /proc/sys/kernel/random/uuid | sha1sum | awk '{print $1}' # Can be generated with e.g. cat /proc/sys/kernel/random/uuid | sha1sum | awk '{print $1}'
FRESHRSS_SALT= FRESHRSS_SALT=
@ -68,7 +68,7 @@ FRESHRSS_SALT=
FRESHRSS_BASE_URL="http://localhost/" FRESHRSS_BASE_URL="http://localhost/"
FRESHRSS_LANGUAGE="en" FRESHRSS_LANGUAGE="en"
FRESHRSS_TITLE="FreshRSS" FRESHRSS_TITLE="FreshRSS"
FRESHRSS_META_DESCRIPTION FRESHRSS_META_DESCRIPTION=
FRESHRSS_DEFAULT_USER="_" FRESHRSS_DEFAULT_USER="_"
FRESHRSS_ALLOW_ANONYMOUS="false" FRESHRSS_ALLOW_ANONYMOUS="false"
FRESHRSS_ALLOW_ANONYMOUS_REFRESH="false" FRESHRSS_ALLOW_ANONYMOUS_REFRESH="false"

3
overlay/usr/local/bin/healthcheck.sh Executable file
View File

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