From 725b78e4d71abaa32b0cd6f5a4edbbabbc3cd587 Mon Sep 17 00:00:00 2001 From: radu Date: Thu, 24 Oct 2024 18:24:52 +0200 Subject: [PATCH] chore(dc): update env variables to new format --- docker-compose.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 54126d3..011d3a3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,8 +7,8 @@ services: volumes: - db-data:/var/lib/postgresql/data environment: - - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:?} - - POSTGRES_DB=${POSTGRES_DB:-db} + - POSTGRES_PASSWORD=${DC_VIKUNJA_POSTGRES_PASSWORD:?} + - POSTGRES_DB=${DC_VIKUNJA_POSTGRES_DB:-db} healthcheck: test: ["CMD-SHELL", "pg_isready -U postgres"] interval: 5s @@ -21,25 +21,25 @@ services: image: vikunja/vikunja:0.24.4@sha256:c93c58841215592c51a40fa978da25efadd1fff2460b42443c344132f322eef1 environment: VIKUNJA_DATABASE_HOST: db - VIKUNJA_DATABASE_PASSWORD: ${POSTGRES_PASSWORD:?} + VIKUNJA_DATABASE_PASSWORD: ${DC_VIKUNJA_POSTGRES_PASSWORD:?} VIKUNJA_DATABASE_TYPE: postgres VIKUNJA_DATABASE_USER: postgres - VIKUNJA_DATABASE_DATABASE: ${POSTGRES_DB:-db} - VIKUNJA_SERVICE_PUBLICURL: https://${VIKUNJA_VHOST:-tasks.martin.md} - VIKUNJA_SERVICE_JWTSECRET: ${VIKUNJA_JWTSECRET:?} + VIKUNJA_DATABASE_DATABASE: ${DC_VIKUNJA_POSTGRES_DB:-db} + VIKUNJA_SERVICE_PUBLICURL: https://${DC_VIKUNJA_HOSTNAME:?} + VIKUNJA_SERVICE_JWTSECRET: ${DC_VIKUNJA_JWTSECRET:?} VIKUNJA_SERVICE_ENABLETASKATTACHMENTS: 1 VIKUNJA_SERVICE_ENABLEREGISTRATION: 1 VIKUNJA_SERVICE_ENABLEEMAILREMINDERS: 1 VIKUNJA_MAILER_ENABLED: 1 VIKUNJA_MAILER_FORCESSL: 1 - VIKUNJA_MAILER_HOST: ${SMTP_HOST:-mail.martin.md} - VIKUNJA_MAILER_PORT: ${SMTP_PORT:-587} - VIKUNJA_MAILER_USERNAME: ${SMTP_USER:-noreply@martin.md} - VIKUNJA_MAILER_PASSWORD: ${SMTP_PWD:?} + VIKUNJA_MAILER_HOST: ${DC_VIKUNJA_SMTP_HOST:-mail.martin.md} + VIKUNJA_MAILER_PORT: ${DC_VIKUNJA_SMTP_PORT:-587} + VIKUNJA_MAILER_USERNAME: ${DC_VIKUNJA_SMTP_USER:-noreply@martin.md} + VIKUNJA_MAILER_PASSWORD: ${DC_VIKUNJA_SMTP_PWD:?} - VIRTUAL_HOST: ${VIKUNJA_VHOST:-tasks.martin.md} - VIRTUAL_PORT: ${VIKUNJA_VPORT:-3456} - LETSENCRYPT_HOST: ${VIKUNJA_VHOST:-tasks.martin.md} + VIRTUAL_HOST: ${DC_VIKUNJA_HOSTNAME:?} + VIRTUAL_PORT: ${DC_VIKUNJA_PORT:-3456} + LETSENCRYPT_HOST: ${DC_VIKUNJA_HOSTNAME:?} volumes: - files:/app/vikunja/files - /srv/docker/vikunja-config.yml:/app/vikunja/config.yml