From 6ab7f05ee9d53543ca511d9bbc5112a9f5878607 Mon Sep 17 00:00:00 2001
From: choqy <qd.zhang@qq.com>
Date: Wed, 24 Nov 2021 04:05:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96docker=E9=83=A8=E7=BD=B2?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/deploy.sh                     | 12 ++++++++++--
 docker/docker-compose.yml            | 19 +++++++++----------
 docker/lynn-cloud/all/dockerfile     |  3 +++
 docker/lynn-cloud/all/jar/startup.sh |  8 +++++---
 docker/lynn-cloud/gateway/dockerfile |  3 +++
 docker/mysql/db/quartz.sql           |  2 +-
 docker/nginx/dockerfile              |  3 +++
 7 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/docker/deploy.sh b/docker/deploy.sh
index 78f0da72..11fc58f3 100644
--- a/docker/deploy.sh
+++ b/docker/deploy.sh
@@ -2,7 +2,7 @@
 
 # 使用说明，用来提示输入参数
 usage() {
-	echo "Usage: sh 执行脚本.sh [port|copy|base|modules|stop|rm]"
+	echo "Usage: sh 执行脚本.sh [port|copy|base|allin|modules|stop|rm]"
 	exit 1
 }
 
@@ -48,7 +48,12 @@ copy(){
 
 # 启动基础环境（必须）
 base(){
-	docker-compose up -d lynn-mysql lynn-redis lynn-nacos lynn-nginx
+	docker-compose up -d lynn-mysql lynn-redis lynn-nacos lynn-gateway lynn-nginx
+}
+
+allin(){
+    copy
+    docker-compose up -d lynn-modules-all
 }
 
 # 启动程序模块（必须）
@@ -83,6 +88,9 @@ case "$1" in
 "base")
 	base
 ;;
+"allin")
+	allin
+;;
 "modules")
 	modules
 ;;
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 8cd9e2ba..af864c15 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -29,7 +29,7 @@ services:
     volumes:
       - ./mysql/conf:/etc/mysql/conf.d
       - ./mysql/logs:/logs
-      - ./mysql/data:/var/lib/mysql
+      #- ./mysql/data:/var/lib/mysql
     command: [
           'mysqld',
           '--innodb-buffer-pool-size=80M',
@@ -64,8 +64,8 @@ services:
       - ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf
       - ./nginx/logs:/var/log/nginx
       - ./nginx/conf.d:/etc/nginx/conf.d
-    #depends_on:
-      #- lynn-gateway
+    depends_on:
+      - lynn-gateway
     links:
       - lynn-gateway
   lynn-gateway:
@@ -171,8 +171,9 @@ services:
       dockerfile: dockerfile
     volumes:
       - ./logs/:/home/lynn/logs
+      - ./lynn-cloud/uploadPath:/home/lynn/uploadPath
     ports:
-      - "8080:8080" #gateway
+      #- "8080:8080" #gateway
       - "9200:9200" #auth
       - "9201:9201" #system
       - "9202:9202" #gen
@@ -180,13 +181,11 @@ services:
       - "9300:9300" #file
       - "9500:9500" #magicapi
     depends_on:
+      - lynn-gateway
+      - lynn-mysql
+      - lynn-nacos
       - lynn-redis
     links:
       - lynn-redis
       - lynn-nacos
-      - lynn-mysql
-networks:
-  extnetwork:
-    ipam:
-      config:
-        - subnet: 192.168.222.0/24
\ No newline at end of file
+      - lynn-mysql
\ No newline at end of file
diff --git a/docker/lynn-cloud/all/dockerfile b/docker/lynn-cloud/all/dockerfile
index 36512d65..aa2bdfc1 100644
--- a/docker/lynn-cloud/all/dockerfile
+++ b/docker/lynn-cloud/all/dockerfile
@@ -3,6 +3,9 @@ FROM  openjdk:8-jre
 # author
 MAINTAINER lynn
 
+ENV TimeZone=Asia/Shanghai
+RUN ln -snf /usr/share/zoneinfo/$TimeZone /etc/localtime && echo $TimeZone > /etc/timezone
+
 # 挂载目录
 VOLUME /home/lynn
 # 创建目录
diff --git a/docker/lynn-cloud/all/jar/startup.sh b/docker/lynn-cloud/all/jar/startup.sh
index 87625b5c..7741a2ab 100755
--- a/docker/lynn-cloud/all/jar/startup.sh
+++ b/docker/lynn-cloud/all/jar/startup.sh
@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
 
-nohup java -jar lynn-gateway.jar > /home/lynn/logs/lynn-gateway.log &
 nohup java -jar lynn-auth.jar > /home/lynn/logs/lynn-auth.log &
 nohup java -jar lynn-modules-system.jar > /home/lynn/logs/lynn-system.log &
-nohup java -jar lynn-magic-api.jar > /home/lynn/logs/lynn-magic-api.log &
-tail -f /home/lynn/logs/lynn-gateway.log
\ No newline at end of file
+nohup java -jar lynn-modules-file.jar > /home/lynn/logs/lynn-modules-file.log  &
+nohup java -jar lynn-modules-gen.jar > /home/lynn/logs/lynn-modules-gen.log  &
+nohup java -jar lynn-modules-job.jar > /home/lynn/logs/lynn-modules-job.log  &
+nohup java -jar lynn-magic-api.jar > /home/lynn/logs/lynn-magic-api.log  &
+tail -f /home/lynn/logs/lynn-auth.log
\ No newline at end of file
diff --git a/docker/lynn-cloud/gateway/dockerfile b/docker/lynn-cloud/gateway/dockerfile
index d7e5a996..e54054e9 100644
--- a/docker/lynn-cloud/gateway/dockerfile
+++ b/docker/lynn-cloud/gateway/dockerfile
@@ -3,6 +3,9 @@ FROM  openjdk:8-jre
 # author
 MAINTAINER lynn
 
+ENV TimeZone=Asia/Shanghai
+RUN ln -snf /usr/share/zoneinfo/$TimeZone /etc/localtime && echo $TimeZone > /etc/timezone
+
 # 挂载目录
 VOLUME /home/lynn
 # 创建目录
diff --git a/docker/mysql/db/quartz.sql b/docker/mysql/db/quartz.sql
index 20360ce8..fb706f26 100644
--- a/docker/mysql/db/quartz.sql
+++ b/docker/mysql/db/quartz.sql
@@ -1,4 +1,4 @@
-USE `ruoyi_cloud_db`;
+USE `lynn-cloud-db`;
 
 DROP TABLE IF EXISTS QRTZ_FIRED_TRIGGERS;
 DROP TABLE IF EXISTS QRTZ_PAUSED_TRIGGER_GRPS;
diff --git a/docker/nginx/dockerfile b/docker/nginx/dockerfile
index 45c94f21..27a87b05 100644
--- a/docker/nginx/dockerfile
+++ b/docker/nginx/dockerfile
@@ -3,6 +3,9 @@ FROM nginx
 # author
 MAINTAINER lynn
 
+ENV TimeZone=Asia/Shanghai
+RUN ln -snf /usr/share/zoneinfo/$TimeZone /etc/localtime && echo $TimeZone > /etc/timezone
+
 # 挂载目录
 VOLUME /home/lynn/projects/lynn-ui
 # 创建目录