From 17480b5b82744f4c74b61a2f1e4e5ea780ccc3ff Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期三, 27 十一月 2024 13:45:25 +0800
Subject: [PATCH] 修复冲突
---
jeecg-server-cloud/docker-compose.yml | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/jeecg-server-cloud/docker-compose.yml b/jeecg-server-cloud/docker-compose.yml
index 2e09ff4..db006ef 100644
--- a/jeecg-server-cloud/docker-compose.yml
+++ b/jeecg-server-cloud/docker-compose.yml
@@ -19,18 +19,28 @@
restart: on-failure
environment:
- TZ=Asia/Shanghai
-
- jeecg-boot-demo:
+ jeecg-boot-dry:
depends_on:
- jeecg-boot-nacos
build:
- context: ./jeecg-demo-cloud-start
- container_name: jeecg-demo-start
- hostname: jeecg-boot-demo
+ context: ../jeecg-module-dry/jeecg-module-dry-start
+ container_name: jeecg-module-dry-start
+ hostname: jeecg-boot-dry
restart: on-failure
environment:
- TZ=Asia/Shanghai
+# jeecg-boot-demo:
+# depends_on:
+# - jeecg-boot-nacos
+# build:
+# context: ./jeecg-demo-cloud-start
+# container_name: jeecg-demo-start
+# hostname: jeecg-boot-demo
+# restart: on-failure
+# environment:
+# - TZ=Asia/Shanghai
+
jeecg-boot-gateway:
restart: on-failure
build:
--
Gitblit v1.9.3