From bff23e9117dd208c222b7bd174e7ee41de7ad0b0 Mon Sep 17 00:00:00 2001
From: BetterAndBetterII <1176445047@qq.com>
Date: Mon, 18 Aug 2025 10:53:37 +0000
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.env=20=E7=A4=BA=E4=BE=8B?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BB=A5=E5=8C=85=E5=90=AB=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=94=A8=E6=88=B7=20ID=20=E5=92=8C?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E5=93=88=E5=B8=8C=EF=BC=8C=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=20docker-compose=20=E9=85=8D=E7=BD=AE=E4=BB=A5=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=81=A5=E5=BA=B7=E6=A3=80=E6=9F=A5=E5=92=8C=E7=BD=91?=
 =?UTF-8?q?=E7=BB=9C=E8=AE=BE=E7=BD=AE=EF=BC=8C=E4=BC=98=E5=8C=96=20Dex=20?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BB=A5=E4=BD=BF=E7=94=A8=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E3=80=82=E6=AD=A4=E6=9B=B4=E6=94=B9=E5=A2=9E?=
 =?UTF-8?q?=E5=BC=BA=E4=BA=86=20OIDC=20=E8=AE=A4=E8=AF=81=E7=9A=84?=
 =?UTF-8?q?=E7=81=B5=E6=B4=BB=E6=80=A7=E5=92=8C=E5=AE=89=E5=85=A8=E6=80=A7?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.example.dex       |  5 +++--
 config/dex.config.yaml |  2 +-
 docker-compose.dex.yml | 34 +++++++++++++++++++++++-----------
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/.env.example.dex b/.env.example.dex
index 613acc2..fb19cf8 100644
--- a/.env.example.dex
+++ b/.env.example.dex
@@ -1,11 +1,12 @@
-OIDC_ISSUER_URL=http://localhost:5556/.well-known/openid-configuration
+OIDC_ISSUER_URL=http://localhost:5556
 OIDC_CLIENT_ID=excalidraw
 OIDC_CLIENT_SECRET=excalidraw-secret
 OIDC_REDIRECT_URL=http://localhost:3002/auth/oidc/callback
 
 ADMIN_USERNAME=admin
-ADMIN_PASSWORD=your_secure_password
+ADMIN_PASSWORD_HASH='$2a$10$2b2cU8CPhOTaGrs1HRQuAueS7JTT5ZHsHSzYiFPm1leZck7Mc8T4W'
 ADMIN_EMAIL=admin@example.com
+ADMIN_USER_ID=admin1234
 
 JWT_SECRET=your_super_secret_jwt_string
 
diff --git a/config/dex.config.yaml b/config/dex.config.yaml
index f37b1ad..5dc384d 100644
--- a/config/dex.config.yaml
+++ b/config/dex.config.yaml
@@ -1,4 +1,4 @@
-issuer: http://localhost:5556
+issuer: {{ .Env.OIDC_ISSUER }}
 
 storage:
   type: memory
diff --git a/docker-compose.dex.yml b/docker-compose.dex.yml
index daab2f3..4233ec1 100644
--- a/docker-compose.dex.yml
+++ b/docker-compose.dex.yml
@@ -1,16 +1,23 @@
 version: '3.8'
 
 services:
+  netpod:
+    image: busybox:latest
+    ports:
+      - "5556:5556"  # Dex
+      - "3002:3002"  # Excalidraw
+    command: ["sleep", "infinity"]
+    networks:
+      - excalidraw-network
+
   dex:
     image: dexidp/dex:v2.38.0
     container_name: excalidraw-dex
     restart: unless-stopped
-    ports:
-      - "5556:5556"
     volumes:
       - ./config/dex.config.yaml:/etc/dex/config.yaml
     environment:
-      - OIDC_REDIRECT_URL=${OIDC_REDIRECT_URL:-http://localhost:3000/auth/oidc/callback}
+      - OIDC_REDIRECT_URL=${OIDC_REDIRECT_URL:-http://localhost:3002/auth/oidc/callback}
       - OIDC_CLIENT_SECRET=${OIDC_CLIENT_SECRET:-excalidraw-secret}
       - OIDC_CLIENT_ID=${OIDC_CLIENT_ID:-excalidraw}
       - OIDC_ISSUER=${OIDC_ISSUER:-http://localhost:5556}
@@ -19,20 +26,25 @@ services:
       - ADMIN_EMAIL=${ADMIN_EMAIL:-admin@example.com}
       - ADMIN_USER_ID=${ADMIN_USER_ID:-'admin1234'}
     command: ["dex", "serve", "/etc/dex/config.yaml"]
-    networks:
-      - dex-network
+    healthcheck:
+      test: ["CMD", "wget", "-q", "-O", "/dev/null", "http://localhost:5556/.well-known/openid-configuration"]
+      interval: 1s
+      timeout: 1s
+      retries: 10
+      start_period: 10s
+    network_mode: service:netpod
 
   excalidraw:
-    build:
-      context: .
-      dockerfile: excalidraw-complete.Dockerfile
-    ports:
-      - "3003:3002"
+    image: ghcr.io/betterandbetterii/excalidraw-full:dex-oidc
     volumes:
       - ./data:/root/data
       - ./excalidraw.db:/root/excalidraw.db:Z
       - ./.env:/root/.env
+    depends_on:
+      dex:
+        condition: service_healthy
+    network_mode: service:netpod
 
 networks:
-  dex-network:
+  excalidraw-network:
     driver: bridge