修改docker-compose

energy-manage-service/docker-compose/.env

@@ -1,8 +1,8 @@
-MYSQL_HOST_PORT=3306
-MYSQL_ROOT_USER=admin
+MYSQL_HOST_PORT=33306
+MYSQL_ROOT_USER=root
 MYSQL_ROOT_PASSWORD=admin123456
 MYSQL_DATA_DIR=./mysql
-MYSQL_CONF_FILE=./conf/mysql.cnf
+MYSQL_CONF_FILE=./conf/mysql.MYSQL_SERVICE_HOSTcnf
 
 REDIS_HOST_PORT=6379
 REDIS_PASSWORD=admin123456

energy-manage-service/docker-compose/docker-compose.yml

@@ -1,5 +1,5 @@
 #compose版本
-version: '2.24.6-desktop.1'
+version: '2.33.0'
 #服务列表
 services:
   mysql:
@@ -12,13 +12,14 @@ services:
     ports:
       - ${MYSQL_HOST_PORT}:3306
     environment:
+#      - MYSQL_ROOT_USER=${MYSQL_ROOT_USER}
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
       - TZ=Asia/Shanghai
 
     #将mysql目录映射到本地 应根据自己所需要映射的目录进行修改
     volumes:
       - ${PARENT_WORK_DIR}/mysql-data/conf:/etc/mysql/conf.d
-#      #根据日志路径配置
+      #根据日志路径配置
       - ${PARENT_WORK_DIR}/mysql-data/logs:/var/log/mysql
       - ${PARENT_WORK_DIR}/mysql-data/data:/var/lib/mysql
     restart: on-failure
@@ -50,7 +51,6 @@ services:
     environment:
       - SPRING_DATASOURCE_PLATFORM=${SPRING_DATASOURCE_PLATFORM}
       - MYSQL_SERVICE_HOST=${MYSQL_SERVICE_HOST}
-      - MYSQL_SERVICE_PORT=${MYSQL_SERVICE_PORT}
       - MYSQL_SERVICE_DB_NAME=${MYSQL_SERVICE_DB_NAME}
       - MYSQL_SERVICE_DB_PARAM=${MYSQL_SERVICE_DB_PARAM}
       - MYSQL_SERVICE_USER=${MYSQL_ROOT_USER}
@@ -60,9 +60,7 @@ services:
     ports:
       - "8849:8848"
     volumes:
-      - ${PARENT_WORK_DIR}/nacos:/home/nacos/conf
       - ${PARENT_WORK_DIR}/nacos/logs:/home/nacos/logs
-      - ${PARENT_WORK_DIR}/nacos/data:/home/nacos/data
     restart: on-failure
     depends_on:
       - mysql
@@ -109,7 +107,7 @@ services:
       phm_net:
         ipv4_address: 172.40.0.24
 
-  #创建bucket
+  #自动创建bucket
   mc:
     image: minio/mc:latest
     container_name: mc
@@ -150,25 +148,25 @@ services:
     networks:
       phm_net:
         ipv4_address: 172.40.0.25
-#
-#  nginx:
-#    image: nginx:stable-perl
-#    ports:
-#      - "80:80"
-#      - "443:443"
-#    environment:
-#      - TZ=Asia/Shanghai
-#    #挂载卷
-#    volumes:
-##      - ${PARENT_WORK_DIR}/nginx/nginx.conf:/etc/nginx/nginx.conf
-#      - ${PARENT_WORK_DIR}/nginx/conf.d:/etc/nginx/conf.d
-#      - ${PARENT_WORK_DIR}/nginx/logs:/etc/nginx/logs
-#      - ${PARENT_WORK_DIR}/nginx/html:/usr/share/nginx/html
-#      - ${PARENT_WORK_DIR}/nginx/static:/usr/share/nginx/static
-#    #启动时执行的命令
-#    command: /bin/sh -c "nginx -g 'daemon off;'"
-#    #重启方式
-#    restart: on-failure
+
+  nginx:
+    image: nginx:stable-perl
+    ports:
+      - "80:80"
+      - "443:443"
+    environment:
+      - TZ=Asia/Shanghai
+    #挂载卷
+    volumes:
+      - ${PARENT_WORK_DIR}/nginx/nginx.conf:/etc/nginx/nginx.conf
+      - ${PARENT_WORK_DIR}/nginx/conf.d:/etc/nginx/conf.d
+      - ${PARENT_WORK_DIR}/nginx/logs:/etc/nginx/logs
+      - ${PARENT_WORK_DIR}/nginx/html:/usr/share/nginx/html
+      - ${PARENT_WORK_DIR}/nginx/static:/usr/share/nginx/static
+    #启动时执行的命令
+    command: /bin/sh -c "nginx -g 'daemon off;'"
+    #重启方式
+    restart: on-failure
 
 networks:
   phm_net:

energy-manage-service/docker-compose/mysql/docker-entrypoint.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 export WORK_BASE=/usr/local
-mysql -uroot -padmin1234567 <<EOF
+mysql -uroot -padmin123456 <<EOF
 create database if not exists energy;
 use energy;
 source $WORK_BASE/energy.sql;