Fix DB connection, add healthcheck
This commit is contained in:
parent
4e780ed0a5
commit
caa94f4d69
|
@ -15,8 +15,8 @@ export SELFOSS_PASSWORD=
|
||||||
# The recommended /password hash script currently seems broken; use this instead:
|
# The recommended /password hash script currently seems broken; use this instead:
|
||||||
# http://www.passwordtool.hu/php5-password-hash-generator
|
# http://www.passwordtool.hu/php5-password-hash-generator
|
||||||
|
|
||||||
# Options are ERROR, WARNING, INFO, DEBU
|
# Options are EMERGENCY, ALERT, CRITICAL, ERROR, WARNING, NOTICE, INFO, DEBUG, None
|
||||||
export SELFOSS_LOGGER_LEVEL=DEBUG
|
export SELFOSS_LOGGER_LEVEL=ERROR
|
||||||
|
|
||||||
export ENTRYPOINT_CONF_VERSION=v7
|
export ENTRYPOINT_CONF_VERSION=v7
|
||||||
export DB_PASSWORD_VERSION=v1
|
export DB_PASSWORD_VERSION=v1
|
||||||
|
|
|
@ -11,8 +11,9 @@ production use.
|
||||||
4. Edit `.envrc` - be sure to change `$DOMAIN` to something that resolves to
|
4. Edit `.envrc` - be sure to change `$DOMAIN` to something that resolves to
|
||||||
your Docker swarm box
|
your Docker swarm box
|
||||||
5. `direnv allow` (or `. .envrc`)
|
5. `direnv allow` (or `. .envrc`)
|
||||||
6. `abra deploy`
|
6. `abra secret_generate db_password v1`
|
||||||
8. Open the configured domain in your browser to finish set-up
|
7. `abra deploy`
|
||||||
|
9. Open the configured domain in your browser to finish set-up
|
||||||
|
|
||||||
[selfoss]: https://www.selfoss.aditu.de/
|
[selfoss]: https://www.selfoss.aditu.de/
|
||||||
[abra]: https://git.autonomic.zone/autonomic-cooperative/abra
|
[abra]: https://git.autonomic.zone/autonomic-cooperative/abra
|
||||||
|
|
19
compose.yml
19
compose.yml
|
@ -41,9 +41,9 @@ services:
|
||||||
#- SELFOSS_PASSWORD_FILE=/run/secrets/selfoss_password
|
#- SELFOSS_PASSWORD_FILE=/run/secrets/selfoss_password
|
||||||
- SELFOSS_DB_TYPE
|
- SELFOSS_DB_TYPE
|
||||||
- SELFOSS_LOGGER_LEVEL
|
- SELFOSS_LOGGER_LEVEL
|
||||||
- SELFOSS_DB_HOST="postgres"
|
- SELFOSS_DB_HOST=postgres
|
||||||
- SELFOSS_DB_NAME="selfoss"
|
- SELFOSS_DB_NAME=selfoss
|
||||||
- SELFOSS_DB_USERNAME="selfoss"
|
- SELFOSS_DB_USERNAME=selfoss
|
||||||
- SELFOSS_DB_PASSWORD_FILE=/run/secrets/db_password
|
- SELFOSS_DB_PASSWORD_FILE=/run/secrets/db_password
|
||||||
secrets:
|
secrets:
|
||||||
- db_password
|
- db_password
|
||||||
|
@ -59,13 +59,12 @@ services:
|
||||||
- internal
|
- internal
|
||||||
depends_on:
|
depends_on:
|
||||||
- postgres
|
- postgres
|
||||||
# TODO 3wc: not working currently, complains about YAML syntax error
|
healthcheck:
|
||||||
#healthcheck:
|
test: ["CMD", "wget", "-qO", "-", "http://localhost:8888"]
|
||||||
# test: ["CMD", "wget", "-f" "http://localhost:8888"]
|
interval: 30s
|
||||||
# interval: 30s
|
timeout: 10s
|
||||||
# timeout: 10s
|
retries: 10
|
||||||
# retries: 10
|
start_period: 1m
|
||||||
# start_period: 1m
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
proxy:
|
proxy:
|
||||||
|
|
Loading…
Reference in New Issue