From 8c23d2f2cca5b98293e2a3e3557866d1dfd40d09 Mon Sep 17 00:00:00 2001
From: Darren <27513732@qq.com>
Date: Tue, 26 Dec 2023 17:08:56 +0800
Subject: [PATCH] fix nocobase

---
 apps/nocobase/.env               | 15 +++++++++++++--
 apps/nocobase/Notes.md           | 15 +--------------
 apps/nocobase/docker-compose.yml | 12 ++----------
 3 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/apps/nocobase/.env b/apps/nocobase/.env
index 0662fef41..4029d3fb8 100644
--- a/apps/nocobase/.env
+++ b/apps/nocobase/.env
@@ -9,7 +9,18 @@ W9_ID=nocobase
 W9_HTTP_PORT=80
 W9_HTTP_PORT_SET=9001
 W9_URL=appname.example.com
-W9_LOGIN_PASSWORD=$W9_POWER_PASSWORD
+
+W9_LOGIN_USER=admin@nocobase.com
+W9_LOGIN_PASSWORD=admin123
+
 W9_DB_EXPOSE="mysql"
+W9_DB_VERSION="8"
 W9_NETWORK=websoft9
-#### --------------------------------------------------------------------------------------- ####
\ No newline at end of file
+#### --------------------------------------------------------------------------------------- ####
+
+DB_DIALECT=mysql
+DB_HOST=$W9_ID-mysql
+DB_DATABASE=$W9_ID
+DB_USER=$W9_ID
+DB_PASSWORD=$W9_POWER_PASSWORD
+LOCAL_STORAGE_BASE_URL=/storage/uploads
\ No newline at end of file
diff --git a/apps/nocobase/Notes.md b/apps/nocobase/Notes.md
index 2f71459f1..6a48dc245 100644
--- a/apps/nocobase/Notes.md
+++ b/apps/nocobase/Notes.md
@@ -1,15 +1,2 @@
-# Nocodb
+# Nocobase
 
-Nocodb 提供了非常精准的 [Docker Compose 部署方案](https://github.com/nocodb/nocodb).  
-
-## to do
-
-```
-    ports:
-      - "${W9_PORT}:8080"
-      - "8081:8081"
-      - "8082:8082"
-      - "8083:8083"
-```
-
-除8080之外，其他端口的用途有待研究
\ No newline at end of file
diff --git a/apps/nocobase/docker-compose.yml b/apps/nocobase/docker-compose.yml
index f7389c51b..5962ab934 100644
--- a/apps/nocobase/docker-compose.yml
+++ b/apps/nocobase/docker-compose.yml
@@ -11,21 +11,14 @@ services:
     restart: unless-stopped
     depends_on:
       - mysql
-    environment:
-      - DB_DIALECT=mysql
-      - DB_HOST=$W9_ID-mysql
-      - DB_DATABASE=$W9_ID
-      - DB_USER=$W9_ID
-      - DB_PASSWORD=$W9_POWER_PASSWORD
-      - LOCAL_STORAGE_BASE_URL=/storage/uploads
     volumes:
       - nocobase:/app/nocobase/storage
     ports:
-      - "$W9_HTTP_PORT_SET:$W9_HTTP_PORT"
+      - "$W9_HTTP_PORT_SET:80"
     env_file: .env
 
   mysql:
-    image: mysql:8
+    image: mysql:$W9_DB_VERSION
     container_name: $W9_ID-mysql
     environment:
       MYSQL_DATABASE: $W9_ID
@@ -36,7 +29,6 @@ services:
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
     volumes:
      - mysql:/var/lib/mysql
-    env_file: .env
 
 networks:
   default: