Browse Source

简化docker启动微服务后台,删除jeecg-boot/jeecg-server-cloud/docker-compose-base.yml

JEECG 9 months ago
parent
commit
7b14b5df4a

+ 0 - 49
jeecg-boot/jeecg-server-cloud/docker-compose-base.yml

@@ -1,49 +0,0 @@
-version: '2'
-services:
-  jeecg-boot-mysql:
-    build:
-      context: ../db
-    environment:
-      MYSQL_ROOT_PASSWORD: root
-      MYSQL_ROOT_HOST: '%'
-      TZ: Asia/Shanghai
-    restart: always
-    container_name: jeecg-boot-mysql
-    command:
-      --character-set-server=utf8mb4
-      --collation-server=utf8mb4_general_ci
-      --explicit_defaults_for_timestamp=true
-      --lower_case_table_names=1
-      --max_allowed_packet=128M
-      --default-authentication-plugin=caching_sha2_password
-    ports:
-      - 3306:3306
-    networks:
-      - jeecg-boot
-
-  jeecg-boot-redis:
-    image: redis:5.0
-    ports:
-      - 6379:6379
-    restart: always
-    container_name: jeecg-boot-redis
-    hostname: jeecg-boot-redis
-    networks:
-      - jeecg-boot
-
-
-networks:
-  jeecg-boot:
-    name: jeecg_boot
-
-#  jeecg-boot-rabbitmq:
-#    image: rabbitmq:3.7.7-management
-#    ports:
-#      - 5672:5672
-#      - 15672:15672
-#    restart: always
-#    container_name: jeecg-boot-rabbitmq
-#    hostname: jeecg-boot-rabbitmq
-#    environment:
-#      RABBITMQ_DEFAULT_USER: guest
-#      RABBITMQ_DEFAULT_PASS: guest

+ 44 - 0
jeecg-boot/jeecg-server-cloud/docker-compose.yml

@@ -1,5 +1,49 @@
 version: '2'
 services:
+  jeecg-boot-mysql:
+    build:
+      context: ../db
+    environment:
+      MYSQL_ROOT_PASSWORD: root
+      MYSQL_ROOT_HOST: '%'
+      TZ: Asia/Shanghai
+    restart: always
+    container_name: jeecg-boot-mysql
+    command:
+      --character-set-server=utf8mb4
+      --collation-server=utf8mb4_general_ci
+      --explicit_defaults_for_timestamp=true
+      --lower_case_table_names=1
+      --max_allowed_packet=128M
+      --default-authentication-plugin=caching_sha2_password
+    ports:
+      - 3306:3306
+    networks:
+      - jeecg-boot
+
+  jeecg-boot-redis:
+    image: redis:5.0
+    ports:
+      - 6379:6379
+    restart: always
+    container_name: jeecg-boot-redis
+    hostname: jeecg-boot-redis
+    networks:
+      - jeecg-boot
+
+#  jeecg-boot-rabbitmq:
+#    image: rabbitmq:3.7.7-management
+#    ports:
+#      - 5672:5672
+#      - 15672:15672
+#    restart: always
+#    container_name: jeecg-boot-rabbitmq
+#    hostname: jeecg-boot-rabbitmq
+#    environment:
+#      RABBITMQ_DEFAULT_USER: guest
+#      RABBITMQ_DEFAULT_PASS: guest
+
+
   jeecg-boot-nacos:
     restart: always
     build:

+ 1 - 1
jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/Dockerfile

@@ -12,4 +12,4 @@ EXPOSE 9999
 
 ADD ./target/jeecg-cloud-gateway-3.7.0.jar ./
 
-CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-gateway-3.7.0.jar
+CMD sleep 100;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-gateway-3.7.0.jar

+ 1 - 1
jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/Dockerfile

@@ -12,4 +12,4 @@ EXPOSE 8848
 
 ADD ./target/jeecg-cloud-nacos-3.7.0.jar ./
 
-CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-nacos-3.7.0.jar
+CMD sleep 30;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-nacos-3.7.0.jar

+ 1 - 1
jeecg-boot/jeecg-server-cloud/jeecg-demo-cloud-start/Dockerfile

@@ -12,4 +12,4 @@ EXPOSE 7002
 
 ADD ./target/jeecg-demo-cloud-start-3.7.0.jar ./
 
-CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-demo-cloud-start-3.7.0.jar
+CMD sleep 60;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-demo-cloud-start-3.7.0.jar

+ 1 - 1
jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/Dockerfile

@@ -12,4 +12,4 @@ EXPOSE 7001
 
 ADD ./target/jeecg-system-cloud-start-3.7.0.jar ./
 
-CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-cloud-start-3.7.0.jar
+CMD sleep 60;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-cloud-start-3.7.0.jar