Updated all containers to bring inline with needed Traefik config

Bitwarden/docker-compose.yml

@@ -9,19 +9,18 @@ services:
     volumes:
       - ./bitwarden/:/data/
     networks:
-      - bitwarden
+      - proxy
+    depends_on:
+      - traefik
     labels:
       ## Expose Bitwarden Through Trefik ##
       - "traefik.enable=true" # <== Enable traefik to proxy this container
+      - "traefik.http.services.bitwarden.loadbalancer.server.port=80"
       - "traefik.http.routers.bitwarden.rule=Host(`bitwarden.luke-else.co.uk`) || Host(`www.bitwarden.luke-else.co.uk`)"
-      - "traefik.http.routers.bitwarden.entrypoints=http"
-      - "traefik.http.routers.bitwarden.middlewares=redirect@file"
-
-      - "traefik.http.routers.bitwarden-secured.rule=Host(`bitwarden.luke-else.co.uk`) || Host(`www.bitwarden.luke-else.co.uk`)"
-      - "traefik.http.routers.bitwarden-secured.entrypoints=https"
-      - "traefik.http.routers.bitwarden-secured.tls.certresolver=mytlschallenge"
+      - "traefik.http.routers.bitwarden.entrypoints=websecure"
+      - "traefik.http.routers.bitwarden.tls.certresolver=myresolver"
     restart: unless-stopped
 
 networks:
-  bitwarden:
+  proxy:
     external: true

Database/docker-compose.yml

@@ -8,8 +8,6 @@ services:
     container_name: mongoDB
     volumes:
       - ./mongo/:/data/db
-    networks:
-      - backend
     ports:
       - "27017:27017"
     environment:
@@ -23,12 +21,8 @@ services:
     container_name: MySQL
     volumes: 
       - ./mysql/:/var/lib/mysql
-    networks:
-      - backend
     ports:
       - "3306:3306"
-    depends_on:
-      - traefik
     environment:
       MYSQL_ROOT_PASSWORD: rootpassword
       MYSQL_DATABASE: test_db
@@ -38,7 +32,7 @@ services:
     image: "phpmyadmin/phpmyadmin:latest"
     container_name: phpMyAdmin
     networks:
-      - backend
+      - proxy
     depends_on:
       - mysql
       - traefik
@@ -47,15 +41,12 @@ services:
     labels:
       ## Expose phpMyAdmin Through Trefik ##
       - "traefik.enable=true" # <== Enable traefik to proxy this container
-      - "traefik.http.routers.phpMyAdmin.rule=Host(`mysql.luke-else.co.uk`) || Host(`www.mysql.luke-else.co.uk`)"
-      - "traefik.http.routers.phpMyAdmin.entrypoints=http"
-      - "traefik.http.routers.phpMyAdmin.middlewares=redirect@file"
-
-      - "traefik.http.routers.phpMyAdmin-secured.rule=Host(`mysql.luke-else.co.uk`) || Host(`www.mysql.luke-else.co.uk`)"
-      - "traefik.http.routers.phpMyAdmin-secured.entrypoints=https"
-      - "traefik.http.routers.phpMyAdmin-secured.tls.certresolver=mytlschallenge"
+      - "traefik.http.services.phpmyadmin.loadbalancer.server.port=80"
+      - "traefik.http.routers.phpmyadmin.rule=Host(`mysql.luke-else.co.uk`) || Host(`www.mysql.luke-else.co.uk`)"
+      - "traefik.http.routers.phpmyadmin.entrypoints=websecure"
+      - "traefik.http.routers.phpmyadmin.tls.certresolver=myresolver"
     restart: unless-stopped
 
 networks:
-  backend:
+  proxy:
     external: true

Development/Gitea/docker-compose.yml

@@ -11,6 +11,8 @@ services:
       - /etc/localtime:/etc/localtime:ro
     networks:
       - proxy
+    depends_on:
+      - traefik
     ports:
       - "222:22"
     environment:
@@ -30,7 +32,7 @@ services:
       ## Expose Gitea Through Trefik ##
       - "traefik.enable=true" # <== Enable traefik to proxy this container
       - "traefik.http.services.gitea.loadbalancer.server.port=3000"
-      - "traefik.http.routers.gitea.rule=Host(`test.luke-else.co.uk`)"
+      - "traefik.http.routers.gitea.rule=Host(`test.luke-else.co.uk`) || Host(`www.test.luke-else.co.uk`)"
       - "traefik.http.routers.gitea.entrypoints=websecure"
       - "traefik.http.routers.gitea.tls.certresolver=myresolver"
     restart: unless-stopped

NextCloud/docker-compose.yml

@@ -10,10 +10,11 @@ services:
     volumes:
       - ./nextcloud:/var/www/html
     networks:
-      - services
+      - proxy
       - nextcloud
     depends_on:
       - db
+      - traefik
     environment:
       - MYSQL_USER=nextcloud
       - MYSQL_PASSWORD=
@@ -22,13 +23,10 @@ services:
     labels:
       ## Expose Nextcloud Through Trefik ##
       - "traefik.enable=true" # <== Enable traefik to proxy this container
+      - "traefik.http.services.nextcloud.loadbalancer.server.port=80"
       - "traefik.http.routers.nextcloud.rule=Host(`nextcloud.luke-else.co.uk`) || Host(`www.nextcloud.luke-else.co.uk`)"
-      - "traefik.http.routers.nextcloud.entrypoints=http"
-      - "traefik.http.routers.nextcloud.middlewares=redirect@file"
-
-      - "traefik.http.routers.nextcloud-secured.rule=Host(`nextcloud.luke-else.co.uk`) || Host(`www.nextcloud.luke-else.co.uk`)"
-      - "traefik.http.routers.nextcloud-secured.entrypoints=https"
-      - "traefik.http.routers.nextcloud-secured.tls.certresolver=mytlschallenge"
+      - "traefik.http.routers.nextcloud.entrypoints=websecure"
+      - "traefik.http.routers.nextcloud.tls.certresolver=myresolver"
     restart: unless-stopped
   
   db:
@@ -47,7 +45,7 @@ services:
     restart: unless-stopped
 
 networks:
-  services:
+  proxy:
     external: true
   nextcloud:
     name: nextcloud

Websites/docker-compose.yml

@@ -11,13 +11,10 @@ services:
     labels:
       ## Expose luke-else Through Trefik ##
       - "traefik.enable=true" # <== Enable traefik to proxy this container
-      - "traefik.http.routers.luke-else.rule=Host(`luke-else.co.uk`) || Host(`www.luke-else.co.uk`)"
-      - "traefik.http.routers.luke-else.entrypoints=http"
-      - "traefik.http.routers.luke-else.middlewares=redirect@file"
-
-      - "traefik.http.routers.luke-else-secured.rule=Host(`luke-else.co.uk`) || Host(`www.luke-else.co.uk`)"
-      - "traefik.http.routers.luke-else-secured.entrypoints=https"
-      - "traefik.http.routers.luke-else-secured.tls.certresolver=mytlschallenge"
+      - "traefik.http.services.personal.loadbalancer.server.port=80"
+      - "traefik.http.routers.personal.rule=Host(`luke-else.co.uk`) || Host(`www.luke-else.co.uk`)"
+      - "traefik.http.routers.personal.entrypoints=websecure"
+      - "traefik.http.routers.personal.tls.certresolver=myresolver"
     restart: unless-stopped
 
   snexo.co.uk:
@@ -28,13 +25,10 @@ services:
     labels:
       ## Expose Snexo Through Trefik ##
       - "traefik.enable=true" # <== Enable traefik to proxy this container
-      - "traefik.http.routers.snexo.rule=Host(`snexo.luke-else.co.uk`) || Host(`www.snexo.luke-else.co.uk`)"
-      - "traefik.http.routers.snexo.entrypoints=http"
-      - "traefik.http.routers.snexo.middlewares=redirect@file"
-
-      - "traefik.http.routers.snexo-secured.rule=Host(`snexo.luke-else.co.uk`) || Host(`www.snexo.luke-else.co.uk`)"
-      - "traefik.http.routers.snexo-secured.entrypoints=https"
-      - "traefik.http.routers.snexo-secured.tls.certresolver=mytlschallenge"
+      - "traefik.http.services.snexo.loadbalancer.server.port=80"
+      - "traefik.http.routers.snexo.rule=Host(`snexo.co.uk`) || Host(`www.snexo.co.uk`)"
+      - "traefik.http.routers.snexo.entrypoints=websecure"
+      - "traefik.http.routers.snexo.tls.certresolver=myresolver"
     restart: unless-stopped
 
 networks: