diff --git a/jeecg-server-cloud/docker-compose.yml b/jeecg-server-cloud/docker-compose.yml
index 2e09ff42..3e595947 100644
--- a/jeecg-server-cloud/docker-compose.yml
+++ b/jeecg-server-cloud/docker-compose.yml
@@ -6,9 +6,15 @@ services:
context: ./jeecg-cloud-nacos
ports:
- 8848:8848
+ environment:
+ - SERVER_PORT=8848
+ - DB_URL=jdbc:postgresql://182.92.183.230:5432/nacos
+ - DB_USER=temp
+ - DB_PASSWORD=123456
+ - DB_PLATFORM=postgresql
container_name: jeecg-boot-nacos
hostname: jeecg-boot-nacos
-
+
jeecg-boot-system:
depends_on:
- jeecg-boot-nacos
@@ -20,16 +26,16 @@ services:
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-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
diff --git a/jeecg-server-cloud/jeecg-cloud-nacos/Dockerfile b/jeecg-server-cloud/jeecg-cloud-nacos/Dockerfile
index a2fad421..881dd9ed 100644
--- a/jeecg-server-cloud/jeecg-cloud-nacos/Dockerfile
+++ b/jeecg-server-cloud/jeecg-cloud-nacos/Dockerfile
@@ -1,4 +1,5 @@
-FROM anapsix/alpine-java:8_server-jre_unlimited
+#FROM anapsix/alpine-java:8_server-jre_unlimited
+FROM openjdk:8
MAINTAINER jeecgos@163.com
@@ -10,6 +11,15 @@ WORKDIR /jeecg-cloud-nacos
EXPOSE 8848
+
+ENV DB_URL=""
+ENV DB_USER=""
+ENV DB_PASSWORD=""
+ENV DB_PLATFORM=""
+ENV SERVER_PORT=""
+
+EXPOSE $SERVER_PORT
+
ADD ./target/jeecg-cloud-nacos-3.5.1.jar ./
-CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-nacos-3.5.1.jar
\ No newline at end of file
+CMD sleep 5;java -DSERVER_PORT=$SERVER_PORT -DDB_URL=$DB_URL -DDB_USER=$DB_USER -DDB_PASSWORD=$DB_PASSWORD -DDB_PLATFORM=$DB_PLATFORM -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-nacos-3.5.1.jar
\ No newline at end of file
diff --git a/jeecg-server-cloud/jeecg-cloud-nacos/pom.xml b/jeecg-server-cloud/jeecg-cloud-nacos/pom.xml
index f20fc419..4ad6f1b0 100644
--- a/jeecg-server-cloud/jeecg-cloud-nacos/pom.xml
+++ b/jeecg-server-cloud/jeecg-cloud-nacos/pom.xml
@@ -74,10 +74,15 @@
42.2.25
+
+
+
+
+
- com.alibaba.nacos
- nacos-postgresql-datasource-plugin-ext
- 1.0.0-SNAPSHOT
+ com.pig4cloud.plugin
+ nacos-datasource-plugin-pg
+ 0.0.1