feat: 更新说明

jumpserver · Jul 10, 2024 · 071d9b9 · 071d9b9
1 parent 71f9ef9
commit 071d9b9
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -97,6 +97,7 @@ DOMAINS=
 CORE_HOST=http://core:8080
 
 # Lion
+GUACD_LOG_LEVEL=error
 GUA_HOST=guacd
 GUA_PORT=4822
 
@@ -180,6 +181,7 @@ DOMAINS=
 CORE_HOST=http://core:8080
 
 # Lion
+GUACD_LOG_LEVEL=error
 GUA_HOST=guacd
 GUA_PORT=4822
 

diff --git a/README_EN.md b/README_EN.md
@@ -96,6 +96,7 @@ DOMAINS=
 CORE_HOST=http://core:8080
 
 # Lion
+GUACD_LOG_LEVEL=error
 GUA_HOST=guacd
 GUA_PORT=4822
 
@@ -178,6 +179,7 @@ DOMAINS=
 CORE_HOST=http://core:8080
 
 # Lion
+GUACD_LOG_LEVEL=error
 GUA_HOST=guacd
 GUA_PORT=4822
 

diff --git a/allinone/docker-compose.yml b/allinone/docker-compose.yml
@@ -4,6 +4,7 @@ services:
     container_name: jms_mysql
     restart: always
     environment:
+      TZ: ${TZ:-Asia/Shanghai}
       MARIADB_ROOT_PASSWORD: ${DB_PASSWORD:-Np2qgqtiUayA857GpuVI0Wtg}
       MARIADB_DATABASE: ${DB_NAME:-jumpserver}
     healthcheck:
@@ -23,6 +24,7 @@ services:
     restart: always
     command: redis-server --requirepass ${REDIS_PASSWORD:-KoJqlTDu1d5HwfXgJ4QTbZQt}
     environment:
+      TZ: ${TZ:-Asia/Shanghai}
       REDIS_PASSWORD: ${REDIS_PASSWORD:-KoJqlTDu1d5HwfXgJ4QTbZQt}
     healthcheck:
       test: "redis-cli -h 127.0.0.1 -a $$REDIS_PASSWORD info Replication"

diff --git a/config_example.conf b/config_example.conf
@@ -40,6 +40,7 @@ DOMAINS=
 CORE_HOST=http://core:8080
 
 # Lion
+GUACD_LOG_LEVEL=error
 GUA_HOST=guacd
 GUA_PORT=4822
 

diff --git a/docker-compose-build.yml b/docker-compose-build.yml
@@ -75,9 +75,7 @@ services:
     container_name: jms_guacd
     user: root
     restart: always
-    environment:
-      TZ: ${TZ:-Asia/Shanghai}
-      GUACD_LOG_LEVEL: ${GUACD_LOG_LEVEL:-error}
+    env_file: .env
     volumes:
       - ${VOLUME_DIR}/lion/data:/opt/lion/data
     networks:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -101,9 +101,7 @@ services:
       placement:
         constraints:
           - "node.role==worker"
-    environment:
-      TZ: ${TZ:-Asia/Shanghai}
-      GUACD_LOG_LEVEL: ${GUACD_LOG_LEVEL:-error}
+    env_file: .env
     volumes:
       - ${VOLUME_DIR}/lion/data:/opt/lion/data
     networks: