Upgraded and refactored Traefik (#585)

docker-compose-generator/docker-fragments/bitcoin-clightning.yml

@@ -85,6 +85,9 @@ services:
       RTL_SSO: 1
       RTL_COOKIE_PATH: /data/.cookie
       LOGOUT_REDIRECT_LINK: /server/services
+    labels:
+      traefik.enable: true
+      traefik.http.routers.bitcoin_rtl.rule: Host(`${BTCPAY_HOST}`) && (Path(`/rtl`) || PathPrefix(`/rtl/`))
     volumes:
       - "clightning_bitcoin_datadir:/root/.lightning"
       - "bitcoin_datadir:/etc/bitcoin"

docker-compose-generator/docker-fragments/bitcoin-eclair.yml

@@ -31,8 +31,8 @@ services:
         -Declair.bitcoind.zmqblock=tcp://bitcoind:28334
         -Declair.bitcoind.zmqtx=tcp://bitcoind:28333
     expose:
-      - "9735"  # server port
-      - "8080"  # api port
+      - "9735" # server port
+      - "8080" # api port
     volumes:
       - "bitcoin_datadir:/etc/bitcoin"
       - "eclair_bitcoin_datadir:/data"
@@ -56,6 +56,9 @@ services:
       - "eclair_bitcoin_rtl_datadir:/data"
     expose:
       - "3000"
+    labels:
+      traefik.enable: true
+      traefik.http.routers.bitcoin_rtl.rule: Host(`${BTCPAY_HOST}`) && (Path(`/rtl`) || PathPrefix(`/rtl/`))
     links:
       - eclair_bitcoin
 

docker-compose-generator/docker-fragments/bitcoin-lnd.yml

@@ -66,6 +66,9 @@ services:
       - "lnd_bitcoin_rtl_datadir:/data"
     expose:
       - "3000"
+    labels:
+      traefik.enable: true
+      traefik.http.routers.bitcoin_rtl.rule: Host(`${BTCPAY_HOST}`) && (Path(`/rtl`) || PathPrefix(`/rtl/`))
     links:
       - lnd_bitcoin
 

docker-compose-generator/docker-fragments/btcpayserver.yml

@@ -1,7 +1,6 @@
 version: "3"
 
 services:
-
   btcpayserver:
     restart: unless-stopped
     image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.5.4$<BTCPAY_BUILD_CONFIGURATION>?}
@@ -21,6 +20,10 @@ services:
       BTCPAY_DEBUGLOG: btcpay.log
       BTCPAY_UPDATEURL: https://api.github.com/repos/btcpayserver/btcpayserver/releases/latest
       BTCPAY_DOCKERDEPLOYMENT: "true"
+    labels:
+      traefik.enable: true
+      traefik.http.routers.btcpayserver.rule: Host(`${BTCPAY_HOST}`)
+      # Traefic can not accept list from BTCPAY_ADDITIONAL_HOSTS, see Traefik/README.md
     links:
       - postgres
     volumes:

docker-compose-generator/docker-fragments/opt-add-btctransmuter.yml

@@ -21,6 +21,9 @@ services:
       VIRTUAL_HOST: ${BTCTRANSMUTER_HOST}
       VIRTUAL_HOST_NAME: "btctransmuter"
       TRANSMUTER_BTCPayAuthServer: "http://btcpayserver:49392"
+    labels:
+      traefik.enable: true
+      traefik.http.routers.btctransmuter.rule: Host(`${BTCPAY_HOST}`) && (Path(`/btctransmuter`) || PathPrefix(`/btctransmuter/`))
     expose:
       - "80"
     links:

docker-compose-generator/docker-fragments/opt-add-thunderhub.yml

@@ -19,6 +19,9 @@ services:
       NO_CLIENT_ACCOUNTS: "true"
       LOG_LEVEL: debug
       LOGOUT_URL: "/server/services/thunderhub/BTC"
+    labels:
+      traefik.enable: true
+      traefik.http.routers.bitcoin_thub.rule: Host(`${BTCPAY_HOST}`) && (Path(`/thub`) || PathPrefix(`/thub/`))
     volumes:
       - "lnd_bitcoin_datadir:/etc/lnd"
       - "lnd_bitcoin_thub_datadir:/data"

docker-compose-generator/docker-fragments/traefik-labels.yml

@@ -1,12 +0,0 @@
-version: "3"
-
-services:
-  btcpayserver:
-    labels:
-      - "traefik.backend=btcpayserver"
-      - "traefik.backend.loadbalancer.sticky=true"
-      - "traefik.enable=true"
-      - "traefik.frontend.rule=Host:${BTCPAY_HOST}"
-      - "traefik.port.rule=49392"
-      - "traefik.acme.domains=${BTCPAY_HOST},www.${BTCPAY_HOST}"
-      - "traefik.acme.email=${LETSENCRYPT_EMAIL}"

docker-compose-generator/docker-fragments/traefik.yml

@@ -3,23 +3,19 @@ version: "3"
 services:
   traefik:
     restart: unless-stopped
-    image: traefik
+    image: traefik:v2.6
     container_name: traefik
     ports:
       - "${REVERSEPROXY_HTTP_PORT:-80}:80"
       - "${REVERSEPROXY_HTTPS_PORT:-443}:443"
+      - "8080:8080" # Dashboard, enable for debug only
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"
-      - "./traefik.toml:/traefik.toml"
-      - "./acme.json:/acme.json:ro"
-      - "./servers.toml:/servers.toml"
-      - "./traefik_logs:/traefik_logs"
-
-    links:
-      - btcpayserver
+      - "../Traefik/traefik.yml:/traefik.yml"
+      - "traefik_data:/data"
 
 volumes:
-  traefik_logs:
+  traefik_data:
 
 exclusive:
   - proxy