修改docker-compose

energy-manage-service/Dockerfile

@@ -1,36 +0,0 @@
-# 该镜像需要依赖的基础镜像
-#FROM --platform=linux/amd64 jdk8:latest
-FROM swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/openjdk:8-alpine-linuxarm64
-
-
-# 指定维护者的名字
-MAINTAINER shiyue
-# 设置自定义标签
-LABEL version="1.0.0"
-
-# 创建工作目录
-RUN mkdir -p /data/app/logs
-
-# 生成接口挂载点
-#VOLUME ["/data/app/logs"]
-
-# 将当前目录下的jar包复制到docker容器的/目录下
-ADD target/*.jar /data/app/energy-manage-service.jar
-
-#设置时区
-RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
-#RUN echo 'Asia/Shanghai' >/etc/timezone
-
-#设置环境变量
-ENV LANG = "zh_CN.UTF-8"
-ENV JAVA_OPTS=" -Duser.timezone=Asia/Shanghai -server -Xmx2048m -Xms2048m -Xss512k "
-ENV JAVA_USER=" -XX:+UseFastAccessorMethods -XX:MaxMetaspaceSize=512m -XX:MetaspaceSize=512m  -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=92 -XX:+UseCMSCompactAtFullCollection -XX:CMSFullGCsBeforeCompaction=0 "
-ENV JAVA_OOM=" -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=java_heapdump.hprof "
-
-
-# 声明运行端口
-EXPOSE 16200
-
-# 指定docker容器启动时运行jar包
-ENTRYPOINT ["sh", "-c", " java $JAVA_OPTS $JAVA_USER $JAVA_OOM -Dfile.encoding=utf-8  -jar /data/app/energy-manage-service.jar "]
-

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

@@ -2,123 +2,123 @@
 version: '2.24.6-desktop.1'
 #服务列表
 services:
-#  mysql:
-##    env_file:
-##      - .env
-#    build:
-#      context: .
-#      dockerfile: ./mysql/Dockerfile
-#     #容器名称
-#    container_name: energy-mysql
-#    #端口映射
-#    ports:
-#      - ${MYSQL_HOST_PORT}:3306
-#    environment:
-#      - 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
+  mysql:
+    env_file:
+      - .env
+    build:
+      context: .
+      dockerfile: ./mysql/Dockerfile
+     #容器名称
+    container_name: energy-mysql
+    #端口映射
+    ports:
+      - ${MYSQL_HOST_PORT}:3306
+    environment:
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
+      - TZ=Asia/Shanghai
 
-#  redis:
-#    image: redis
-#    container_name: energy-redis
-#    environment:
-#      - REDIS_PASSWORD=${REDIS_PASSWORD}
-#      - TZ=Asia/Shanghai
-#    ports:
-#      - ${REDIS_HOST_PORT}:6379
-#    volumes:
-#      - ${PARENT_WORK_DIR}/redis-data/data:/data
-##      - ${PARENT_WORK_DIR}/redis-data/conf/redis.conf:/usr/local/etc/redis/redis.conf
-#      - ${PARENT_WORK_DIR}/redis-data/logs:/logs
-#    restart: on-failure
+    #将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
 
+  redis:
+    image: redis
+    container_name: energy-redis
+    environment:
+      - REDIS_PASSWORD=${REDIS_PASSWORD}
+      - TZ=Asia/Shanghai
+    ports:
+      - ${REDIS_HOST_PORT}:6379
+    volumes:
+      - ${PARENT_WORK_DIR}/redis-data/data:/data
+#      - ${PARENT_WORK_DIR}/redis-data/conf/redis.conf:/usr/local/etc/redis/redis.conf
+      - ${PARENT_WORK_DIR}/redis-data/logs:/logs
+    restart: on-failure
 
-#  nacos:
-#    image: nacos/nacos-server
-#    container_name: energy-nacos
-#    #如果挂载卷中指定nacos application.properties文件，则不需要指定以下环境变量
-#    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_SERVICE_USER}
-#      - MYSQL_SERVICE_PASSWORD=${MYSQL_ROOT_PASSWORD}
-#      - MODE=${MODE}
-##      - NACOS_AUTH_TOKEN=SecretKey012345678901234567890123456789012345678901234567890123456789
-#    ports:
-#      - "8849:8848"
-##    volumes:
-##      - ${PARENT_WORK_DIR}/nacos:/data/nacos/conf
-#    restart: on-failure
-#    depends_on:
-#      - mysql
 
-#  xxl_job:
-#    build:
-#      context: .
-#      dockerfile: ./xxl-job/Dockerfile
-#      container_name: energy-xxl-job
-#      ports:
-#        - "16900:16900"
-#      environment:
-#        - TZ=Asia/Shanghai
-##      volumes:
-##        - ${PARENT_WORK_DIR}/xxl-job/conf:/data/applogs/xxl-job/conf
-#      dependson:
-#        - mysql
-#      restart: on-failure
+  nacos:
+    image: nacos/nacos-server
+    container_name: energy-nacos
+    #如果挂载卷中指定nacos application.properties文件，则不需要指定以下环境变量
+    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_SERVICE_USER}
+      - MYSQL_SERVICE_PASSWORD=${MYSQL_ROOT_PASSWORD}
+      - MODE=${MODE}
+      - NACOS_AUTH_TOKEN=SecretKey012345678901234567890123456789012345678901234567890123456789
+    ports:
+      - "8849:8848"
+#    volumes:
+#      - ${PARENT_WORK_DIR}/nacos:/data/nacos/conf
+    restart: on-failure
+    depends_on:
+      - mysql
 
-#  minio:
+  xxl_job:
+    build:
+      context: .
+      dockerfile: ./xxl-job/Dockerfile
+      container_name: energy-xxl-job
+      ports:
+        - "16900:16900"
+      environment:
+        - TZ=Asia/Shanghai
+#      volumes:
+#        - ${PARENT_WORK_DIR}/xxl-job/conf:/data/applogs/xxl-job/conf
+      dependson:
+        - mysql
+      restart: on-failure
 
+  minio:
 
-#  energy-admin:
-#    # 指定构建文件
-#    build:
-#      context: .
-#      # dockerfile文件所在路径
-#      dockerfile: ./Dockerfile
-##    #或者指定镜像都可以
-##    image: timo-service:1.0.3
-#    container_name: energy-admin
-#    environment:
-#      - TZ=Asia/Shanghai
-#    #端口映射
-#    ports:
-#      - "16200:16200"
-#    volumes:
-#      - ${PARENT_WORK_DIR}/energy/logs:/data/app/logs
-#    restart: on-failure
-#    depends_on:
-#      - mysql
-#      - redis
-#      - nacos
-#
-#  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
+
+  energy-admin:
+    # 指定构建文件
+    build:
+      context: .
+      # dockerfile文件所在路径
+      dockerfile: ./Dockerfile
+#    #或者指定镜像都可以
+#    image: timo-service:1.0.3
+    container_name: energy-admin
+    environment:
+      - TZ=Asia/Shanghai
+    #端口映射
+    ports:
+      - "16200:16200"
+    volumes:
+      - ${PARENT_WORK_DIR}/energy/logs:/data/app/logs
+    restart: on-failure
+    depends_on:
+      - mysql
+      - redis
+      - nacos
+
+  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