diff --git a/jeecg-boot/jeecg-server-cloud/docker-compose-base.yml b/jeecg-boot/jeecg-server-cloud/docker-compose-base.yml deleted file mode 100644 index a406c41a..00000000 --- a/jeecg-boot/jeecg-server-cloud/docker-compose-base.yml +++ /dev/null @@ -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 diff --git a/jeecg-boot/jeecg-server-cloud/docker-compose.yml b/jeecg-boot/jeecg-server-cloud/docker-compose.yml index 0a4415f3..c3fdc8c9 100644 --- a/jeecg-boot/jeecg-server-cloud/docker-compose.yml +++ b/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: diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/Dockerfile b/jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/Dockerfile index 53c0aaae..16b63b4c 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/Dockerfile +++ b/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 \ No newline at end of file +CMD sleep 100;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-gateway-3.7.0.jar \ No newline at end of file diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/Dockerfile b/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/Dockerfile index 0c84a7d4..aa25a2c4 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-cloud-nacos/Dockerfile +++ b/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 \ No newline at end of file +CMD sleep 30;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-nacos-3.7.0.jar \ No newline at end of file diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-demo-cloud-start/Dockerfile b/jeecg-boot/jeecg-server-cloud/jeecg-demo-cloud-start/Dockerfile index bfc5dac3..6cf5adce 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-demo-cloud-start/Dockerfile +++ b/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 diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/Dockerfile b/jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/Dockerfile index 45b2039d..be876717 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/Dockerfile +++ b/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 \ No newline at end of file +CMD sleep 60;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-cloud-start-3.7.0.jar \ No newline at end of file