refactoring

docker/docker-compose.yaml

@@ -20,7 +20,9 @@ services:
       - gitea
   db:
     image: mysql:8
-    restart: always
+    networks:
+      - gitea
+    restart: unless-stopped
     environment:
       - MYSQL_ROOT_PASSWORD=${DB_ROOT_PASSWORD}
       - MYSQL_USER=${DB_USER}
@@ -31,15 +33,29 @@ services:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
       - db-dumps:/db-dumps
+  duplicati:
+    image: duplicati-mysqlclient
     networks:
       - gitea
+    environment:
+      - MYSQL_HOST=db
+      - MYSQL_DATABASE=${DB_NAME}
+      - MYSQL_USER=${DB_USER}
+      - MYSQL_PASSWORD=${DB_PASSWORD}
+      - DESTINATION=/git/db-dumps
+    volumes:
+      - duplicati-data:/data
+      - duplicati-data:/git/duplicati-data:ro
+      - data:/git/data:ro
+      - db:/git/db:ro
+      - db-dumps:/git/db-dumps
+    ports:
+      - ${DUPLICATI_PORT}:8200
+    restart: unless-stopped
 volumes:
+  duplicati-data:
   data:
-    name: ${GITEA_APP_DATA_VOLUME_NAME}
   db:
-    name: ${GITEA_DB_DATA_VOLUME_NAME}
   db-dumps:
-    name: ${GITEA_DB_DUMPS_VOLUME_NAME}
 networks:
   gitea:
-    name: ${DEFAULT_NETWORK_NAME}  

docker/duplicati-docker-compose.yaml

@@ -1,32 +0,0 @@
-version: "3"
-services:
-  duplicati:
-    image: duplicati-mysqlclient
-    environment:
-      - MYSQL_HOST=db
-      - MYSQL_DATABASE=${DB_NAME}
-      - MYSQL_USER=${DB_USER}
-      - MYSQL_PASSWORD=${DB_PASSWORD}
-      - DESTINATION=/git/db-dumps
-    volumes:
-      - duplicati-data:/data
-      - duplicati-data:/git/duplicati-data:ro
-      - data:/git/data:ro
-      - db:/git/db:ro
-      - db-dumps:/git/db-dumps
-    ports:
-      - ${DUPLICATI_PORT}:8200
-    restart: unless-stopped
-    networks:
-      - gitea
-volumes:
-  duplicati-data:
-  data:
-    name: ${GITEA_APP_DATA_VOLUME_NAME}
-  db:
-    name: ${GITEA_DB_DATA_VOLUME_NAME}
-  db-dumps:
-    name: ${GITEA_DB_DUMPS_VOLUME_NAME}
-networks:
-  gitea:
-    name: ${DEFAULT_NETWORK_NAME}