From ed18191eab7b2389a49fb8701e196ce19c3b0352 Mon Sep 17 00:00:00 2001
From: Philipp Le <philipp-le-prviat@freenet.de>
Date: Tue, 23 Feb 2021 00:44:23 +0100
Subject: fix: Traefik label bugs and attach front service to Traefik network

The network must be reachable by Traefik. So attach the front service to
the external network created by Traefik.
---
 docker-compose.yml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 64bca8b..91cf355 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,6 +11,8 @@ services:
             MYSQL_DATABASE: ${MYSQL_DATABASE}
             MYSQL_USER: ${MYSQL_USER}
             MYSQL_PASSWORD: ${MYSQL_PASSWORD}
+        networks:
+            - baikal_internal
 
     baikal:
         depends_on:
@@ -25,11 +27,22 @@ services:
             CONTAINER_HOST_NAME: ${HOST_NAME}
         restart: unless-stopped
         labels:
+            - "traefik.enable=true"
             - "traefik.http.routers.baikal.rule=Host(`${HOST_NAME}.${DOMAIN_NAME}`)"
             - "traefik.http.middlewares.baikal-path.replacepathregex.regex=^/${PATH_PREFIX}/(.*)"
             - "traefik.http.middlewares.baikal-path.replacepathregex.replacement=/$$1"
-            - "traefik.http.routers.baikal-nosub.rule=(Host(`${DOMAIN_NAME}`) || Host(`www.${DOMAIN_NAME}`) && PathPrefix(`${PATH_PREFIX}`)"
+            - "traefik.http.routers.baikal-nosub.rule=(Host(`${DOMAIN_NAME}`) || Host(`www.${DOMAIN_NAME}`)) && PathPrefix(`/${PATH_PREFIX}`)"
             - "traefik.http.routers.baikal-nosub.middlewares=baikal-path@docker"
-            - "traefik.http.routers.baikal-wellknown.rule=(Host(`${DOMAIN_NAME}`) || Host(`www.${DOMAIN_NAME}`) && (Path(`.well-known/caldav`) || Path(`.well-known/carddav`))"
+            - "traefik.http.routers.baikal-wellknown.rule=(Host(`${DOMAIN_NAME}`) || Host(`www.${DOMAIN_NAME}`)) && (Path(`/.well-known/caldav`) || Path(`/.well-known/carddav`))"
+            - "traefik.docker.network=traefik_network"
         volumes:
             - ${VOLUMES_DIR}/Specific:/var/www/html/Specific
+        networks:
+            - baikal_internal
+            - traefik_network
+
+networks:
+    baikal_internal:
+    traefik_network:
+        external: true
+        name: traefik_network
-- 
cgit v1.1