reenable healthcheck, formatting

This commit is contained in:
Philipp Rothmann 2022-08-19 09:15:35 +02:00
parent d3dc008f5b
commit 9a7723167f
1 changed files with 18 additions and 17 deletions

View File

@ -3,11 +3,11 @@ version: "3.8"
services: services:
api: api:
image: vikunja/api image: vikunja/api
environment: environment:
- DOMAIN - DOMAIN
- LOG_LEVEL - LOG_LEVEL
volumes: volumes:
- files:/app/vikunja/files - files:/app/vikunja/files
networks: networks:
- proxy - proxy
@ -27,13 +27,13 @@ services:
- "traefik.http.routers.${STACK_NAME}_api.rule=Host(`${DOMAIN}`) && PathPrefix(`/api/v1`, `/dav/`, `/.well-known/`)" - "traefik.http.routers.${STACK_NAME}_api.rule=Host(`${DOMAIN}`) && PathPrefix(`/api/v1`, `/dav/`, `/.well-known/`)"
- "traefik.http.routers.${STACK_NAME}_api.entrypoints=web-secure" - "traefik.http.routers.${STACK_NAME}_api.entrypoints=web-secure"
- "traefik.http.routers.${STACK_NAME}_api.tls.certresolver=${LETS_ENCRYPT_ENV}" - "traefik.http.routers.${STACK_NAME}_api.tls.certresolver=${LETS_ENCRYPT_ENV}"
# healthcheck: healthcheck:
# test: ["CMD", "curl", "-f", "http://localhost:3456"] test: [ "CMD", "curl", "-f", "http://localhost:3456" ]
# interval: 30s interval: 30s
# timeout: 10s timeout: 10s
# retries: 10 retries: 10
# start_period: 1m start_period: 1m
app: app:
image: vikunja/frontend image: vikunja/frontend
networks: networks:
@ -49,7 +49,7 @@ services:
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}" - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
- "coop-cloud.${STACK_NAME}.version=" - "coop-cloud.${STACK_NAME}.version="
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost"] test: [ "CMD", "curl", "-f", "http://localhost" ]
interval: 30s interval: 30s
timeout: 10s timeout: 10s
retries: 10 retries: 10
@ -69,7 +69,7 @@ services:
volumes: volumes:
- db:/var/lib/postgresql/data - db:/var/lib/postgresql/data
healthcheck: healthcheck:
test: ["CMD", "pg_isready", "-U", "vikunja"] test: [ "CMD", "pg_isready", "-U", "vikunja" ]
networks: networks:
- internal - internal
secrets: secrets:
@ -78,21 +78,22 @@ services:
restart_policy: restart_policy:
condition: on-failure condition: on-failure
labels: labels:
backupbot.backup: "true" backupbot.backup: "true"
backupbot.backup.pre-hook: "mkdir -p /tmp/backup/ && PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE}) pg_dump -U $${POSTGRES_USER} $${POSTGRES_DB} > /tmp/backup/backup.sql" backupbot.backup.pre-hook: "mkdir -p /tmp/backup/ && PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE}) pg_dump -U $${POSTGRES_USER} $${POSTGRES_DB} > /tmp/backup/backup.sql"
backupbot.backup.post-hook: "rm -rf /tmp/backup" backupbot.backup.post-hook: "rm -rf /tmp/backup"
backupbot.backup.path: "/tmp/backup/" backupbot.backup.path: "/tmp/backup/"
volumes: volumes:
files: files:
db: db:
networks: networks:
proxy: proxy:
external: true external: true
internal: internal:
configs: configs:
config_yml: config_yml:
name: ${STACK_NAME}_config_yml_${CONFIG_YML_VERSION} name: ${STACK_NAME}_config_yml_${CONFIG_YML_VERSION}
@ -105,4 +106,4 @@ secrets:
name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION} name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
jwt_secret: jwt_secret:
external: true external: true
name: ${STACK_NAME}_jwt_secret_${SECRET_JWT_SECRET_VERSION} name: ${STACK_NAME}_jwt_secret_${SECRET_JWT_SECRET_VERSION}