From 62334b2f85be93643752909f352135e9e938ffb4 Mon Sep 17 00:00:00 2001 From: Simon C Date: Sat, 31 Dec 2022 15:22:32 +0100 Subject: [PATCH 1/2] feat(Vaultwarden): Ajout de la variable pour configurer le nom du service --- vaultwarden/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vaultwarden/docker-compose.yml b/vaultwarden/docker-compose.yml index 288e328..07b34db 100644 --- a/vaultwarden/docker-compose.yml +++ b/vaultwarden/docker-compose.yml @@ -9,7 +9,7 @@ volumes: services: vaultwarden: image: ${VAULTWARDEN_CONTAINER_NAME:-vaultwarden/server:1.27.0-alpine} - container_name: vaultwarden + container_name: ${VAULTWARDEN_CONTAINER_NAME:-vaultwarden} restart: always depends_on: - postgres From 4bf479d0e0dcea45ef1c6c0c44fa7f635e51de38 Mon Sep 17 00:00:00 2001 From: Simon C Date: Sat, 31 Dec 2022 15:24:38 +0100 Subject: [PATCH 2/2] feat(Vaultwarden): Move postgres dependency on postgres file --- vaultwarden/docker-compose.postgres.yml | 4 +++- vaultwarden/docker-compose.yml | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vaultwarden/docker-compose.postgres.yml b/vaultwarden/docker-compose.postgres.yml index 49fc448..58e2bf7 100644 --- a/vaultwarden/docker-compose.postgres.yml +++ b/vaultwarden/docker-compose.postgres.yml @@ -4,5 +4,7 @@ version: "3.8" services: vaultwarden: + depends_on: + - postgres environment: - DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_CONTAINER_NAME}:5432/${POSTGRES_DB} \ No newline at end of file + DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_CONTAINER_NAME}:5432/${POSTGRES_DB} diff --git a/vaultwarden/docker-compose.yml b/vaultwarden/docker-compose.yml index 07b34db..c2ca4a1 100644 --- a/vaultwarden/docker-compose.yml +++ b/vaultwarden/docker-compose.yml @@ -11,8 +11,6 @@ services: image: ${VAULTWARDEN_CONTAINER_NAME:-vaultwarden/server:1.27.0-alpine} container_name: ${VAULTWARDEN_CONTAINER_NAME:-vaultwarden} restart: always - depends_on: - - postgres environment: ADMIN_TOKEN: ${VAULTWARDEN_ADMIN_TOKEN:?err} DOMAIN: https://${VAULTWARDEN_DOMAIN:?err}