From 9e13486f0e577016608b608c7239b176605bd7bb Mon Sep 17 00:00:00 2001 From: thiuda Date: Wed, 27 Dec 2023 12:50:58 +0100 Subject: [PATCH] refactor: make service name configurable --- defaults/main.yml | 5 ++--- templates/docker-compose.yml.j2 | 11 +++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 1609dd1..021e1a9 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,7 +1,6 @@ ---- - bitwarden_domain: pass.example.com bitwarden_image: vaultwarden/server -bitwarden_version: 1.24.0-alpine bitwarden_port_web: 80 bitwarden_port_ws: 3021 +bitwarden_service_name: bitwarden +bitwarden_version: 1.24.0-alpine diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2 index 5820af1..125e44f 100644 --- a/templates/docker-compose.yml.j2 +++ b/templates/docker-compose.yml.j2 @@ -1,21 +1,20 @@ +# vim: set ft=yaml # {{ ansible_managed }} # commit: {{ lookup('pipe', 'git rev-parse --short HEAD') }} version: "3.4" - services: - bitwarden: - image: {{ bitwarden_image }}:{{ bitwarden_version }} + "{{ bitwarden_service_name }}": + image: "{{ bitwarden_image }}:{{ bitwarden_version }}" restart: unless-stopped container_name: bitwarden hostname: bitwarden ports: - - 127.0.0.1:{{ bitwarden_port_web }}:80 - - 127.0.0.1:{{ bitwarden_port_ws }}:3021 + - "127.0.0.1:{{ bitwarden_port_web }}:80" + - "127.0.0.1:{{ bitwarden_port_ws }}:3021" volumes: - data:/data env_file: - ./.env - volumes: data: