From 8e771e1905380f87bce3070f56998aca8892d5d9 Mon Sep 17 00:00:00 2001
From: hzhang <hzhang@hangman-lab.top>
Date: Thu, 5 Dec 2024 13:39:08 +0000
Subject: [PATCH] read configs from env

---
 .env.template       | 13 +++++++++++++
 HangmanLab.Backend  |  2 +-
 HangmanLab.Frontend |  2 +-
 docker-compose.yml  | 18 ++++++++----------
 4 files changed, 23 insertions(+), 12 deletions(-)
 create mode 100644 .env.template

diff --git a/.env.template b/.env.template
new file mode 100644
index 0000000..2d21e92
--- /dev/null
+++ b/.env.template
@@ -0,0 +1,13 @@
+MYSQL_ROOT_PASSWORD=
+MYSQL_PASSWORD=
+DB_HOST=
+DB_PORT=
+DB_NAME=
+DB_USER=
+DB_PASSWORD=
+BACKEND_HOST=
+FRONTEND_HOST=
+KC_CLIENT_ID=
+KC_HOST=
+KC_REALM=
+SESSION_SECRET_KEY=
\ No newline at end of file
diff --git a/HangmanLab.Backend b/HangmanLab.Backend
index 9d0fd5b..178219f 160000
--- a/HangmanLab.Backend
+++ b/HangmanLab.Backend
@@ -1 +1 @@
-Subproject commit 9d0fd5b33c57f3fbc5e9dc3b0affaaaaa35c6be2
+Subproject commit 178219f097110d0a2adcafecfd56463285c8f072
diff --git a/HangmanLab.Frontend b/HangmanLab.Frontend
index 3c53ef7..8bae53d 160000
--- a/HangmanLab.Frontend
+++ b/HangmanLab.Frontend
@@ -1 +1 @@
-Subproject commit 3c53ef7a8729a298005d40f41f19b4a515c1d89e
+Subproject commit 8bae53d026e93fe45fde7238c816245484a7e1ca
diff --git a/docker-compose.yml b/docker-compose.yml
index 32c37a8..c817df6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,6 @@
 version: '3.8'
 
+
 services:
   backend:
     build:
@@ -8,14 +9,8 @@ services:
     container_name: backend
     ports:
       - "5000:5000"
-    environment:
-      - DB_HOST=mysql
-      - DB_PORT=3306
-      - DB_NAME=hangmanlab
-      - DB_USER=hangman
-      - DB_PASSWORD=${DB_PASSWORD}
-      - SERVER_HOST=http://localhost:3000
-      - APP_CLIENT_ID=labdev
+    env_file:
+      - .env
     depends_on:
       - mysql
     networks:
@@ -25,6 +20,9 @@ services:
     build:
       context: ./HangmanLab.Frontend
       dockerfile: Dockerfile
+    env_file:
+      - .env
+
     container_name: frontend
     ports:
       - "3000:3000"
@@ -40,8 +38,8 @@ services:
       - "3306:3306"
     environment:
       MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
-      MYSQL_DATABASE: hangmanlab
-      MYSQL_USER: hangman
+      MYSQL_DATABASE: ${DB_NAME}
+      MYSQL_USER: ${DB_USER}
       MYSQL_PASSWORD: ${MYSQL_PASSWORD}
     volumes:
       - mysql_data:/var/lib/mysql