running

docker-compose.yml

@@ -3,8 +3,6 @@ services:
   wallabag:
     image: wallabag/wallabag
     environment:
-      - PUID=1002
-      - PGID=1002
       - MYSQL_ROOT_PASSWORD=wallaroot
       - SYMFONY__ENV__DATABASE_DRIVER=pdo_mysql
       - SYMFONY__ENV__DATABASE_HOST=db
@@ -17,25 +15,21 @@ services:
       - SYMFONY__ENV__MAILER_USER=~
       - SYMFONY__ENV__MAILER_PASSWORD=~
       - SYMFONY__ENV__FROM_EMAIL=wallabag@example.com
-#      - SYMFONY__ENV__DOMAIN_NAME=http://161.97.82.244
+      - SYMFONY__ENV__DOMAIN_NAME=https://wallabag.franv.site
-      - SYMFONY__ENV__DOMAIN_NAME=https://wallabag.airdog.site
+      - VIRTUAL_HOST=wallabag.franv.site
-      - VIRTUAL_HOST=wallabag.airdog.site
+      - LETSENCRYPT_HOST=wallabag.franv.site
-      - LETSENCRYPT_HOST=wallabag.airdog.site
       - LETSENCRYPT_EMAIL=ouch@thetrauma.org
-
+    labels:
-#    ports:
+      - diun.enable=true
-#      - "9003:80"
     networks:
      wallabag_back:
-     franvproxy_test_proxy-tier:
+     acme-companion_proxy-tier:
 
     volumes:
       - ./images:/var/www/wallabag/web/assets/images
   db:
     image: mariadb
     environment:
-      - PUID=1002
-      - PGID=1002
       - MYSQL_ROOT_PASSWORD=wallaroot
     volumes:
       - ./data:/var/lib/mysql
@@ -52,12 +46,10 @@ services:
         - db      
       restart: always
       volumes:
-        - /opt/backup:/backup
+        - ./backup:/backup
-      environment:
+      environment:     
-        - PUID=1002
-        - PGID=1002      
         - CRON_SCHEDULE=15 1 * * *
-        - BACKUP_FILE=mariadb
+        - BACKUP_FILE=wallabag_mariadb
         - MYSQL_HOST=db
         - MYSQL_USER=root
         - MYSQL_PASS=wallaroot       
@@ -71,6 +63,6 @@ services:
 
 networks:
   wallabag_back:
-  franvproxy_test_proxy-tier:
+  acme-companion_proxy-tier:
     external: true