From 206a7dc02ac60b07838d28fdc1dcabe657cf7548 Mon Sep 17 00:00:00 2001 From: thiuda Date: Sat, 17 Feb 2024 15:27:18 +0100 Subject: [PATCH] refactor: add custom name for bitwarden project to ensure different volumes / container names --- README.md | 3 ++- defaults/main.yml | 3 ++- templates/docker-compose.yml.j2 | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f6922d0..6a49357 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,8 @@ ``` - bitwarden_version Docker image version to use - bitwarden_domain Fully qualified domain name, e.g. vault.example.tld +- bitwarden_project Project name for docker-compose - bitwarden_admin_token Token for admin panel - bitwarden_port_web UI port to run on localhost - bitwarden_port_ws Socket port to run on localhost -``` \ No newline at end of file +``` diff --git a/defaults/main.yml b/defaults/main.yml index 823a8e8..e6cab99 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,6 +1,7 @@ bitwarden_domain: vault.example.com +bitwarden_project: example bitwarden_image: vaultwarden/server bitwarden_version: 1.24.0-alpine bitwarden_port_web: 80 bitwarden_port_ws: 3021 -bitwarden_service_name: bitwarden +bitwarden_service_name: bitwarden-{{ bitwarden_project }} diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2 index 125e44f..496d508 100644 --- a/templates/docker-compose.yml.j2 +++ b/templates/docker-compose.yml.j2 @@ -13,8 +13,8 @@ services: - "127.0.0.1:{{ bitwarden_port_web }}:80" - "127.0.0.1:{{ bitwarden_port_ws }}:3021" volumes: - - data:/data + - "data-{{ bitwarden_project }}":/data env_file: - ./.env volumes: - data: + "data-{{ bitwarden_project }}":