Merge branch 'master' of cloud21.cvtt.vpn:/opt/store/git/cvtt2/docker-compose

gitea/docker-compose.yml

@@ -1,5 +1,4 @@
-version: "3"
-
+#
 networks:
   gitea:
     external: false
@@ -21,6 +20,3 @@ services:
     ports:
       - "3000:3000"
       - "20022:22"
-
-env_file:
-  - .env

registry/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   registry:
     image: registry:2

registry/sync_docker_registry.sh

@@ -2,8 +2,11 @@
 
 # Variables
 PRIMARY_HOST=cloud21.cvtt.vpn
-SECONDARY_DATA_DIR=/works/docker/registry/data
 PRIMARY_DATA_DIR=/opt/store/cvtt/docker_registry/data
 
+SECONDARY_DATA_DIR=/works/docker/registry/data
+
 # Sync data from primary to secondary
-rsync -avz --delete cvtt@$PRIMARY_HOST:$PRIMARY_DATA_DIR/ $SECONDARY_DATA_DIR/
+Cmd="rsync -avz --delete cvtt@$PRIMARY_HOST:$PRIMARY_DATA_DIR/ $SECONDARY_DATA_DIR/"
+echo ${Cmd}
+eval ${Cmd}

vaultwarden/docker-compose.yml

@@ -1,17 +1,15 @@
-version: "3.7"
+#
 services:
   vaultwarden:
     image: vaultwarden/server:latest
     container_name: vaultwarden
     restart: always
     volumes:
-      - /opt/vaultwarden/vw-data:/data
+      - ${DOCKER_SERVICES_DIR}/vaultwarden/vw-data:/data
     ports:
       - "8011:80"
     environment:
-      DOMAIN: "http://homestore.cvtt.vpn"
+      DOMAIN: "http://hs01.cvtt.vpn"
       WEBSOCKET_ENABLED: "true"
       RUST_LOG: "debug"
 
-env_file:
-  - .env