From a26a4a525d999628341697c6be9efec91145e6fd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Sat, 28 Sep 2024 08:32:23 +0000 Subject: [PATCH 1/6] chore(deps): update postgres docker tag to v17 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index f0a4073..1e0a3d7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: db: - image: postgres:16.4@sha256:17b6fe3a18780358f7f44a02bc21a8ef5f349aa83d8dae96d43cd168a97cf6fa + image: postgres:17.0@sha256:4ec37d2a07a0067f176fdcc9d4bb633a5724d2cc4f892c7a2046d054bb6939e5 restart: unless-stopped volumes: - db-data:/var/lib/postgresql/data From 9594e324c63072de2cd64503887c372dca538139 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Sun, 29 Sep 2024 14:31:27 +0000 Subject: [PATCH 2/6] chore(deps): update vikunja/vikunja docker tag to v0.24.4 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index f0a4073..54126d3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: - vikunja vikunja: - image: vikunja/vikunja:0.24.3@sha256:c400bdcb2ae4a78fccb9b463d01f96d1b2cfaef3484a4dd5c2a26e55eadc2d7a + image: vikunja/vikunja:0.24.4@sha256:c93c58841215592c51a40fa978da25efadd1fff2460b42443c344132f322eef1 environment: VIKUNJA_DATABASE_HOST: db VIKUNJA_DATABASE_PASSWORD: ${POSTGRES_PASSWORD:?} From 725b78e4d71abaa32b0cd6f5a4edbbabbc3cd587 Mon Sep 17 00:00:00 2001 From: radu Date: Thu, 24 Oct 2024 18:24:52 +0200 Subject: [PATCH 3/6] 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 From 1ab6163b843ce6bf2c48fa925170aa8f3ad7b3cf Mon Sep 17 00:00:00 2001 From: radu Date: Mon, 28 Oct 2024 10:53:45 +0100 Subject: [PATCH 4/6] chore(dc): migrate to traefik and rename env variables --- docker-compose.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 011d3a3..dbc77a0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,25 +36,25 @@ services: 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: ${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 + labels: + - "traefik.enable=true" + - "traefik.http.routers.vikunja.rule=Host(`${DC_VIKUNJA_HOSTNAME:?}`)" + - "traefik.http.routers.vikunja.entrypoints=websecure" depends_on: db: condition: service_healthy restart: unless-stopped networks: - vikunja - - net + - traefik networks: vikunja: external: false - net: + traefik: external: true volumes: From 82f2e8cf48103a00963b5b8d5d38f25693c8e209 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Sat, 9 Nov 2024 13:39:33 +0000 Subject: [PATCH 5/6] chore(deps): update postgres:16.4 docker digest to 91f464e --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index dbc77a0..92cd4e0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: db: - image: postgres:16.4@sha256:17b6fe3a18780358f7f44a02bc21a8ef5f349aa83d8dae96d43cd168a97cf6fa + image: postgres:16.4@sha256:91f464e7ba0ad91a106c94cff079fb4384139291b8c0502fd36989cf2c788bbb restart: unless-stopped volumes: - db-data:/var/lib/postgresql/data From b0e177098069f888fd053aad9520a900fff8166a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Sat, 9 Nov 2024 13:39:50 +0000 Subject: [PATCH 6/6] chore(deps): update postgres docker tag to v17 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 92cd4e0..526362e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: db: - image: postgres:16.4@sha256:91f464e7ba0ad91a106c94cff079fb4384139291b8c0502fd36989cf2c788bbb + image: postgres:17.0@sha256:8d3be35b184e70d81e54cbcbd3df3c0b47f37d06482c0dd1c140db5dbcc6a808 restart: unless-stopped volumes: - db-data:/var/lib/postgresql/data