From 3a254d804e8cde9e78e156c404c06be703eb0d8a Mon Sep 17 00:00:00 2001
From: lixuliang <lixuliang_hd@126.com>
Date: 星期二, 20 八月 2024 17:26:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/se-cloud
---
docker-compose/docker-compose.yml | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index b7f6734..6323696 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -19,13 +19,16 @@
'--lower-case-table-names=1'
]
environment:
+ TZ: Asia/Shanghai
MYSQL_DATABASE: 'se-cloud'
MYSQL_ROOT_PASSWORD: My_Sql_s!E_v5.7
+ restart: always
# nacos
se-nacos:
- image: nacos/nacos-server:2.3.2
+ image: nacos/nacos-server:v2.4.1
environment:
- - MODE=standalone
+ MODE: standalone
+ TZ: Asia/Shanghai
volumes:
- ./nacos/logs/:/home/nacos/logs
- ./nacos/conf/application.properties:/home/nacos/conf/application.properties
@@ -35,15 +38,17 @@
- 9849:9849
depends_on:
- se-mysql
+ restart: always
# redis
se-redis:
image: redis:latest
ports:
- 6379:6379
volumes:
- - ./redis/conf/redis.conf:/usr/local/etc/redis
+ - ./redis/data/redis.conf:/data/redis.conf
- ./redis/data:/data
command: redis-server /data/redis.conf
+ restart: always
# gateway
se-gateway:
image: openjdk:8-jre
@@ -53,11 +58,14 @@
- ./gateway:/data
environment:
TZ: Asia/Shanghai
- entrypoint: java -jar /data/se-gateway.jar
+ entrypoint: java -jar /data/se-gateway.jar --spring.config.location=file:/data/
depends_on:
- se-redis
+ - se-nacos
links:
- se-redis
+ - se-nacos
+ restart: always
# auth
se-auth:
image: openjdk:8-jre
@@ -67,13 +75,13 @@
- ./auth:/data
environment:
TZ: Asia/Shanghai
- entrypoint: java -jar /data/se-auth.jar
+ entrypoint: java -jar /data/se-auth.jar --spring.config.location=file:/data/
depends_on:
- se-redis
- links:
- - se-redis
+ - se-nacos
+ restart: always
# system
- se-modules-system:
+ se-system:
image: openjdk:8-jre
ports:
- 9201:9201
@@ -81,24 +89,24 @@
- ./system:/data
environment:
TZ: Asia/Shanghai
- entrypoint: java -jar /data/se-modules-system.jar
+ entrypoint: java -jar /data/se-modules-system.jar --spring.config.location=file:/data/
depends_on:
- se-redis
+ - se-nacos
- se-mysql
- links:
- - se-redis
- - se-mysql
+ restart: always
# nginx
se-nginx:
image: nginx:latest
ports:
- 8090:80
+ environment:
+ TZ: Asia/Shanghai
volumes:
- - ./nginx/html/dist:/home/se/projects/se-ui
- - ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf
- ./nginx/logs:/var/log/nginx
- ./nginx/conf.d:/etc/nginx/conf.d
+ - ./nginx/html:/usr/share/nginx/html
+ - ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf
depends_on:
- se-gateway
- links:
- - se-gateway
+ restart: always
--
Gitblit v1.9.3