From 6f1d04afc3acc8713950861c4afb9e87a83ae0df Mon Sep 17 00:00:00 2001
From: Teck Meng <furyx@hotmail.com>
Date: Wed, 29 May 2024 09:29:52 +0800
Subject: [PATCH] Refactor docker-compose.yml to update dozzle service
 configuration

---
 compose/base.yml                           | 7 ++++---
 compose/traefik/middlewares-basic-auth.yml | 8 ++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 compose/traefik/middlewares-basic-auth.yml

diff --git a/compose/base.yml b/compose/base.yml
index ae36791..8dde228 100644
--- a/compose/base.yml
+++ b/compose/base.yml
@@ -1,7 +1,8 @@
 x-environment: &default-environment
   LOG_LEVEL: "ERROR"
   ACME_PATH: "./acme.json"
-  NETWORK: "${NETWORK:-host}"
+  NETWORK: "${NETWORK:-web}"
+  DOMAINNAME: "${DOMAINNAME:-furyhawk.lol}"
   TZ: "${TZ:-Asia/Singapore}"
   FIN_LOCATION: ""
   STREAMLIT_FIN_SERVER_PORT: "8501"
@@ -23,7 +24,7 @@ services:
     security_opt:
       - no-new-privileges:true
     environment:
-      - TZ="${TZ:-Asia/Singapore}"
+      <<: *default-environment
     restart: always
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
@@ -81,6 +82,6 @@ services:
       - "traefik.enable=true"
       - "traefik.http.routers.traefik.entrypoints=web-secure"
       - "traefik.http.routers.traefik.rule=Host(`dashboard.${DOMAINNAME}`)"
-      - "traefik.http.routers.traefik.middlewares=auth"
+      - "traefik.http.routers.traefik.middlewares=auth@file"
       - "traefik.http.routers.traefik.tls.certresolver=letsencrypt"
       - "traefik.http.routers.traefik.service=api@internal"
diff --git a/compose/traefik/middlewares-basic-auth.yml b/compose/traefik/middlewares-basic-auth.yml
new file mode 100644
index 0000000..55c2390
--- /dev/null
+++ b/compose/traefik/middlewares-basic-auth.yml
@@ -0,0 +1,8 @@
+http:
+  middlewares:
+    middlewares-basic-auth:
+      basicAuth:
+        # users:
+        #   - "user:$apsdfswWvC/6.$E3FtsfTntPC0wVJ7IUVtX1"
+        usersFile: "/run/secrets/basic_auth_credentials" 
+        realm: "Traefik 3 Basic Auth"
\ No newline at end of file