Compare commits

..

No commits in common. "6e2e5ffa00853f4d8d9534911302f55fe5ae80fa" and "2247ba13c59f88313dff940e0bc7e2fe8346950c" have entirely different histories.

3 changed files with 3 additions and 7 deletions

View File

@ -167,7 +167,7 @@ write_files:
permissions: 744
content: |
#!/bin/sh
gunicorn --bind 0.0.0.0:${PORT:-8000} --preload --access-logfile - --daemon morss
gunicorn --bind 0.0.0.0:${PORT:-8000} ${GUNICORN} --preload --access-logfile - --daemon morss
runcmd:
- update-ca-certificates
@ -439,7 +439,6 @@ To pass environment variables:
- docker-compose: add an `environment:` section in the .yml file
- Gunicorn/uWSGI/CLI: prepend `KEY=value` before the command
- Apache: via the `SetEnv` instruction (see sample `.htaccess` provided)
- cloud-init: in the `/etc/environment` file
Generic:
@ -492,9 +491,6 @@ entries. NB. When using `diskcache`, this is the cache max size in Bytes.
- `CACHE_LIFESPAN` (seconds) sets how often the cache must be trimmed (i.e. cut
down to the number of items set in `CACHE_SIZE`). Defaults to 1min.
Gunicorn also accepts command line arguments via the `GUNICORN_CMD_ARGS`
environment variable.
### Content matching
The content of articles is grabbed with our own readability fork. This means

View File

@ -5,7 +5,7 @@
"value": 1,
"required": false
},
"GUNICORN_CMD_ARGS": {
"GUNICORN": {
"value": "",
"required": false
},

2
docker-entry.sh 100644 → 100755
View File

@ -4,7 +4,7 @@ if [ "$1" = "sh" ] || [ "$1" = "bash" ]; then
exec $@
elif [ -z "$1" ] || [ "$@" = "run" ]; then
gunicorn --bind 0.0.0.0:${PORT:-8000} --preload --access-logfile - morss
gunicorn --bind 0.0.0.0:${PORT:-8000} ${GUNICORN} --preload --access-logfile - morss
else
morss $@