From 4ea52b130a5445f9d036c07044e781a29acb7efa Mon Sep 17 00:00:00 2001
From: LRVT <21357789+l4rm4nd@users.noreply.github.com>
Date: Sun, 26 Feb 2023 03:57:35 +0100
Subject: [PATCH] Update docker-compose.yml

improve structure and remove whitespaces
---
 examples/vaultwarden/docker-compose.yml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/examples/vaultwarden/docker-compose.yml b/examples/vaultwarden/docker-compose.yml
index fad097f..c599b54 100644
--- a/examples/vaultwarden/docker-compose.yml
+++ b/examples/vaultwarden/docker-compose.yml
@@ -2,7 +2,10 @@ version: "3"
 
 services:
   vaultwarden:
+    image: vaultwarden/server:latest
     container_name: vaultwarden
+    hostname: vaultwarden
+    restart: unless-stopped
     dns:
       - 1.1.1.1
     environment:
@@ -21,10 +24,10 @@ services:
       - TZ=Europe/Berlin
       - LOG_LEVEL=error
       - EXTENDED_LOGGING=true
-    hostname: vaultwarden
     ports:
       - 8888:80
-    image: vaultwarden/server:latest
+    #networks:
+    #  - proxy
     #labels:
     #  - com.centurylinklabs.watchtower.monitor-only=true
     #  - traefik.enable=true
@@ -35,7 +38,6 @@ services:
     #  - traefik.http.routers.vaultwarden-ws.rule=Host(`bitwarden.example.com`) && Path(`/notifications/hub`)
     #  - traefik.http.routers.vaultwarden-ws.service=vaultwarden-ws
     #  - traefik.http.services.vaultwarden-ws.loadbalancer.server.port=3012
-    restart: unless-stopped
     volumes:
       - ${DOCKER_VOLUME_STORAGE:-/mnt/docker-volumes}/vaultwarden/data:/data
       - ${DOCKER_VOLUME_STORAGE:-/mnt/docker-volumes}/vaultwarden/logs:/data/logs
@@ -43,10 +45,10 @@ services:
   # this service will backup your vaultwarden instance corretly
   # see https://github.com/Bruceforce/vaultwarden-backup for more information
   vaultwarden-backup:
+    image: bruceforce/vaultwarden-backup:latest
     container_name: vaultwarden-backup
     hostname: vaultwarden-backup
-    image: bruceforce/vaultwarden-backup:latest
-    restart: on-failure
+    restart: always
     init: true
     depends_on:
       - vaultwarden
@@ -57,6 +59,8 @@ services:
       - ${DOCKER_VOLUME_STORAGE:-/mnt/docker-volumes}/vaultwarden/backup:/myBackup
       - /etc/localtime:/etc/localtime:ro
       - /etc/timezone:/etc/timezone:ro
+    #networks:
+    #  - proxy
     environment:
       - TIMESTAMP=true
       - DELETE_AFTER=30
@@ -65,3 +69,7 @@ services:
       - TZ=Europe/Berlin
       - BACKUP_DIR=/myBackup
       - CRON_TIME=50 3 * * * # see https://crontab.guru/
+
+#networks:
+#  proxy:
+#    external: true