Update Docker Compose

VB_DSM_V2.1/Scripts/Dockers/docker-compose-iwb.yml

@@ -23,10 +23,9 @@ services:
       --explicit_defaults_for_timestamp=true
       --lower_case_table_names=0
     privileged: true
-    # network_mode: "host"
+
     networks:
       - vbdsm-net
-
   nginx-web:
     image: nginx:1.22.1
     container_name: vbdsm-nginx-web
@@ -47,10 +46,8 @@ services:
       # 日志目录
       - /home/iwb/vbdsm/nginx/log:/var/log/nginx
     privileged: true
-    # network_mode: "host"
     networks:
       - vbdsm-net
-
   redis:
     image: redis:6.2.7
     container_name: vbdsm-redis
@@ -61,41 +58,38 @@ services:
       - TZ
     volumes:
       # 配置文件
-      - /home/iwb/vbdsm/redis/conf:/redis/config:rw
+      - /home/iwb/vbdsm/redis/conf/:/redis/config/:rw
       # 数据文件
       - /home/iwb/vbdsm/redis/data/:/redis/data/:rw
     command: "redis-server /redis/config/redis.conf"
     privileged: true
-    # network_mode: "host"
     networks:
       - vbdsm-net
 
   vber-server-passport:
-    build: ${PROJECT_DIR}vbdsm-passport
-    image: vbdsm-passport:1.0.0
+    build: ../../vbdsm-web/vbdsm-passport
+    image: vbdsm-passport:2.1.0
     container_name: vbdsm-passport
     restart: always
     ports:
-      - "8081:8080"
+      - "7081:8080"
     environment:
       - TZ
       - SERVER_PORT
     volumes:
       # 日志文件
       - /home/iwb/vbdsm/server-logs/passport/:/vbdsm/logs/
-
     privileged: true
-    # network_mode: "host"
     networks:
       - vbdsm-net
 
   vber-server-manage:
-    build: ${PROJECT_DIR}vbdsm-manage
-    image: vbdsm-manage:1.0.0
+    build: ../../vbdsm-web/vbdsm-manage
+    image: vbdsm-manage:2.1.0
     container_name: vbdsm-manage
     restart: always
     ports:
-      - "8082:8080"
+      - "7082:8080"
     environment:
       - TZ
       - SERVER_PORT
@@ -103,17 +97,16 @@ services:
       # 日志文件
       - /home/iwb/vbdsm/server-logs/manage/:/vbdsm/logs/
     privileged: true
-    # network_mode: "host"
     networks:
       - vbdsm-net
 
   vber-server-powerservice:
-    build: ${PROJECT_DIR}vbdsm-powerservice
-    image: vbdsm-powerservice:1.0.0
+    build: ../../vbdsm-web/vbdsm-powerservice
+    image: vbdsm-powerservice:2.1.0
     container_name: vbdsm-powerservice
     restart: always
     ports:
-      - "8083:8080"
+      - "7083:8080"
     environment:
       - TZ
       - SERVER_PORT
@@ -121,17 +114,16 @@ services:
       # 日志文件
       - /home/iwb/vbdsm/server-logs/powerservice/:/vbdsm/logs/
     privileged: true
-    # network_mode: "host"
     networks:
       - vbdsm-net
 
   vber-server-gov:
-    build: ${PROJECT_DIR}vbdsm-gov
-    image: vbdsm-gov:1.0.0
+    build: ../../vbdsm-web/vbdsm-gov
+    image: vbdsm-gov:2.1.0
     container_name: vbdsm-gov
     restart: always
     ports:
-      - "8084:8080"
+      - "7084:8080"
     environment:
       - TZ
       - SERVER_PORT
@@ -139,17 +131,16 @@ services:
       # 日志文件
       - /home/iwb/vbdsm/server-logs/gov/:/vbdsm/logs/
     privileged: true
-    # network_mode: "host"
     networks:
       - vbdsm-net
 
   vber-server-gov-new:
-    build: ${PROJECT_DIR}vbdsm-gov-new
-    image: vbdsm-gov-new:1.0.0
+    build: ../../vbdsm-web/vbdsm-gov-new
+    image: vbdsm-gov-new:2.1.0
     container_name: vbdsm-gov-new
     restart: always
     ports:
-      - "8085:8080"
+      - "7085:8080"
     environment:
       - TZ
       - SERVER_PORT
@@ -157,17 +148,16 @@ services:
       # 日志文件
       - /home/iwb/vbdsm/server-logs/gov-new/:/vbdsm/logs/
     privileged: true
-    # network_mode: "host"
     networks:
       - vbdsm-net
 
   vber-server-explorer:
-    build: ${PROJECT_DIR}vbdsm-explorer
-    image: vbdsm-explorer:1.0.0
+    build: ../../vbdsm-web/vbdsm-explorer
+    image: vbdsm-explorer:2.1.0
     container_name: vbdsm-explorer
     restart: always
     ports:
-      - "8086:8080"
+      - "7086:8080"
     environment:
       - TZ
       - SERVER_PORT
@@ -176,35 +166,34 @@ services:
       - /home/iwb/vbdsm/server-logs/gov-new/:/vbdsm/logs/
       - /home/iwb/vbdsm/explorer/fpt:/vbdsm/ftp/
     privileged: true
-    # network_mode: "host"
     networks:
       - vbdsm-net
 
-  vber-server-acquis-ws:
-    build: ${PROJECT_DIR}vbdsm-acquis-ws
-    image: vbdsm-acquis-ws:1.0.0
-    container_name: vbdsm-acquis-ws
+  vber-server-analysis:
+    build: ../../vbdsm-statistics/vbdsm-analysis
+    image: vbdsm-analysis:2.1.0
+    container_name: vbdsm-analysis
     restart: always
     ports:
-      - "8070:8080"
+      - "7087:8080"
     environment:
       - TZ
       - SERVER_PORT
     volumes:
       # 日志文件
-      - /home/iwb/vbdsm/server-logs/acquis-ws/:/vbdsm/logs/
+      - /home/iwb/vbdsm/server-logs/analysis/:/vbdsm/logs/
     privileged: true
-    # network_mode: "host"
     networks:
       - vbdsm-net
 
+
   vber-server-xxl-job:
-    build: ${PROJECT_DIR}vbdsm-job
-    image: vbdsm-job:1.0.0
+    build: ../../vbdsm-job/xxl-job-admin
+    image: vbdsm-job:2.1.0
     container_name: vbdsm-job
     restart: always
     ports:
-      - "9000:8080"
+      - "7200:8080"
     environment:
       - TZ
       - SERVER_PORT
@@ -212,48 +201,82 @@ services:
       # 日志文件
       - /home/iwb/vbdsm/server-logs/job/:/vbdsm/logs/
     privileged: true
-    # network_mode: "host"
     networks:
       - vbdsm-net
 
-  vber-server-analysis:
-    build: ${PROJECT_DIR}vbdsm-analysis
-    image: vbdsm-analysis:1.0.0
-    container_name: vbdsm-analysis
+
+  vber-server-statistics:
+    build: ../../vbdsm-statistics/vbdsm-statistic
+    image: vbdsm-statistics:2.1.0
+    container_name: vbdsm-statistics
     restart: always
     ports:
-      - "9001:8080"
+      # 内部使用了7211端口
+      - "7210:8080"
     environment:
+      # 时区上海
       - TZ
       - SERVER_PORT
     volumes:
       # 日志文件
-      - /home/iwb/vbdsm/server-logs/analysis/:/vbdsm/logs/
+      - /home/iwb/vbdsm/server-logs/statistics/:/vbdsm/logs/
     privileged: true
-    # network_mode: "host"
     networks:
       - vbdsm-net
 
-  vber-server-statistics:
-    build: ${PROJECT_DIR}vbdsm-statistics
-    image: vbdsm-statistics:1.0.0
-    container_name: vbdsm-statistics
+  vber-server-acquis-ws:
+    build: ../../vbdsm-data-upload/vbdsm-acquis-ws
+    image: vbdsm-acquis-ws:2.1.0
+    container_name: vbdsm-acquis-ws
     restart: always
     ports:
-      - "9002:8080"
+      - "7100:8080"
     environment:
-      # 时区上海
       - TZ
       - SERVER_PORT
     volumes:
       # 日志文件
-      - /home/iwb/vbdsm/server-logs/statistics/:/vbdsm/logs/
+      - /home/iwb/vbdsm/server-logs/acquis-ws/:/vbdsm/logs/
+    privileged: true
+    networks:
+      - vbdsm-net
+      -
+  vber-server-hj212-data-collect:
+    build: ../../vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-datacollect
+    image: vbdsm-hj212-data-collect:2.1.0
+    container_name: vbdsm-hj212-data-collect
+    restart: always
+    ports:
+      # 内部使用了7221端口
+      - "7220:8080"
+    environment:
+      - TZ
+      - SERVER_PORT
+    volumes:
+      # 日志文件
+      - /home/iwb/vbdsm/server-logs/hj212-datacollect/:/vbdsm/logs/
+    privileged: true
+    networks:
+      - vbdsm-net
+
+  vber-server-hj212-data-upload:
+    build: ../../vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-server
+    image: vbdsm-hj212-data-upload:2.1.0
+    container_name: vbdsm-hj212-data-upload
+    restart: always
+    ports:
+      # 内部使用了7221端口
+      - "7777:8080"
+    environment:
+      - TZ
+      - SERVER_PORT
+    volumes:
+      # 日志文件
+      - /home/iwb/vbdsm/server-logs/hj212-upload/:/vbdsm/logs/
     privileged: true
-    # network_mode: "host"
     networks:
       - vbdsm-net
 
-#
 networks:
   vbdsm-net:
     external: false

VB_DSM_V2.1/Scripts/Dockers/docker-compose.yml

@@ -23,10 +23,9 @@ services:
       --explicit_defaults_for_timestamp=true
       --lower_case_table_names=0
     privileged: true
-    # network_mode: "host"
+
     networks:
       - vbdsm-net
-
   nginx-web:
     image: nginx:1.22.1
     container_name: vbdsm-nginx-web
@@ -47,10 +46,8 @@ services:
       # 日志目录
       - /home/yue/vbdsm/nginx/log:/var/log/nginx
     privileged: true
-    # network_mode: "host"
     networks:
       - vbdsm-net
-
   redis:
     image: redis:6.2.7
     container_name: vbdsm-redis
@@ -61,41 +58,38 @@ services:
       - TZ
     volumes:
       # 配置文件
-      - /home/yue/vbdsm/redis/conf:/redis/config:rw
+      - /home/yue/vbdsm/redis/conf/:/redis/config/:rw
       # 数据文件
       - /home/yue/vbdsm/redis/data/:/redis/data/:rw
     command: "redis-server /redis/config/redis.conf"
     privileged: true
-    # network_mode: "host"
     networks:
       - vbdsm-net
 
   vber-server-passport:
-    build: ${PROJECT_DIR}vbdsm-passport
-    image: vbdsm-passport:1.0.0
+    build: ../../vbdsm-web/vbdsm-passport
+    image: vbdsm-passport:2.1.0
     container_name: vbdsm-passport
     restart: always
     ports:
-      - "8081:8080"
+      - "7081:8080"
     environment:
       - TZ
-        - SERVER_PORT
+      - SERVER_PORT
     volumes:
       # 日志文件
       - /home/yue/vbdsm/server-logs/passport/:/vbdsm/logs/
-
     privileged: true
-    # network_mode: "host"
     networks:
       - vbdsm-net
 
   vber-server-manage:
-    build: ${PROJECT_DIR}vbdsm-manage
-    image: vbdsm-manage:1.0.0
+    build: ../../vbdsm-web/vbdsm-manage
+    image: vbdsm-manage:2.1.0
     container_name: vbdsm-manage
     restart: always
     ports:
-      - "8082:8080"
+      - "7082:8080"
     environment:
       - TZ
       - SERVER_PORT
@@ -103,17 +97,16 @@ services:
       # 日志文件
       - /home/yue/vbdsm/server-logs/manage/:/vbdsm/logs/
     privileged: true
-    # network_mode: "host"
     networks:
       - vbdsm-net
 
   vber-server-powerservice:
-    build: ${PROJECT_DIR}vbdsm-powerservice
-    image: vbdsm-powerservice:1.0.0
+    build: ../../vbdsm-web/vbdsm-powerservice
+    image: vbdsm-powerservice:2.1.0
     container_name: vbdsm-powerservice
     restart: always
     ports:
-      - "8083:8080"
+      - "7083:8080"
     environment:
       - TZ
       - SERVER_PORT
@@ -121,17 +114,16 @@ services:
       # 日志文件
       - /home/yue/vbdsm/server-logs/powerservice/:/vbdsm/logs/
     privileged: true
-    # network_mode: "host"
     networks:
       - vbdsm-net
 
   vber-server-gov:
-    build: ${PROJECT_DIR}vbdsm-gov
-    image: vbdsm-gov:1.0.0
+    build: ../../vbdsm-web/vbdsm-gov
+    image: vbdsm-gov:2.1.0
     container_name: vbdsm-gov
     restart: always
     ports:
-      - "8084:8080"
+      - "7084:8080"
     environment:
       - TZ
       - SERVER_PORT
@@ -139,17 +131,16 @@ services:
       # 日志文件
       - /home/yue/vbdsm/server-logs/gov/:/vbdsm/logs/
     privileged: true
-    # network_mode: "host"
     networks:
       - vbdsm-net
 
   vber-server-gov-new:
-    build: ${PROJECT_DIR}vbdsm-gov-new
-    image: vbdsm-gov-new:1.0.0
+    build: ../../vbdsm-web/vbdsm-gov-new
+    image: vbdsm-gov-new:2.1.0
     container_name: vbdsm-gov-new
     restart: always
     ports:
-      - "8085:8080"
+      - "7085:8080"
     environment:
       - TZ
       - SERVER_PORT
@@ -157,17 +148,16 @@ services:
       # 日志文件
       - /home/yue/vbdsm/server-logs/gov-new/:/vbdsm/logs/
     privileged: true
-    # network_mode: "host"
     networks:
       - vbdsm-net
 
   vber-server-explorer:
-    build: ${PROJECT_DIR}vbdsm-explorer
-    image: vbdsm-explorer:1.0.0
+    build: ../../vbdsm-web/vbdsm-explorer
+    image: vbdsm-explorer:2.1.0
     container_name: vbdsm-explorer
     restart: always
     ports:
-      - "8086:8080"
+      - "7086:8080"
     environment:
       - TZ
       - SERVER_PORT
@@ -176,35 +166,34 @@ services:
       - /home/yue/vbdsm/server-logs/gov-new/:/vbdsm/logs/
       - /home/yue/vbdsm/explorer/fpt:/vbdsm/ftp/
     privileged: true
-    # network_mode: "host"
     networks:
       - vbdsm-net
 
-  vber-server-acquis-ws:
-    build: ${PROJECT_DIR}vbdsm-acquis-ws
-    image: vbdsm-acquis-ws:1.0.0
-    container_name: vbdsm-acquis-ws
+  vber-server-analysis:
+    build: ../../vbdsm-statistics/vbdsm-analysis
+    image: vbdsm-analysis:2.1.0
+    container_name: vbdsm-analysis
     restart: always
     ports:
-      - "8070:8080"
+      - "7087:8080"
     environment:
       - TZ
       - SERVER_PORT
     volumes:
       # 日志文件
-      - /home/yue/vbdsm/server-logs/acquis-ws/:/vbdsm/logs/
+      - /home/yue/vbdsm/server-logs/analysis/:/vbdsm/logs/
     privileged: true
-    # network_mode: "host"
     networks:
       - vbdsm-net
 
+
   vber-server-xxl-job:
-    build: ${PROJECT_DIR}vbdsm-job
-    image: vbdsm-job:1.0.0
+    build: ../../vbdsm-job/xxl-job-admin
+    image: vbdsm-job:2.1.0
     container_name: vbdsm-job
     restart: always
     ports:
-      - "9000:8080"
+      - "7200:8080"
     environment:
       - TZ
       - SERVER_PORT
@@ -212,48 +201,82 @@ services:
       # 日志文件
       - /home/yue/vbdsm/server-logs/job/:/vbdsm/logs/
     privileged: true
-    # network_mode: "host"
     networks:
       - vbdsm-net
 
-  vber-server-analysis:
-    build: ${PROJECT_DIR}vbdsm-analysis
-    image: vbdsm-analysis:1.0.0
-    container_name: vbdsm-analysis
+
+  vber-server-statistics:
+    build: ../../vbdsm-statistics/vbdsm-statistic
+    image: vbdsm-statistics:2.1.0
+    container_name: vbdsm-statistics
     restart: always
     ports:
-      - "9001:8080"
+      # 内部使用了7211端口
+      - "7210:8080"
     environment:
+      # 时区上海
       - TZ
       - SERVER_PORT
     volumes:
       # 日志文件
-      - /home/yue/vbdsm/server-logs/analysis/:/vbdsm/logs/
+      - /home/yue/vbdsm/server-logs/statistics/:/vbdsm/logs/
     privileged: true
-    # network_mode: "host"
     networks:
       - vbdsm-net
 
-  vber-server-statistics:
-    build: ${PROJECT_DIR}vbdsm-statistics
-    image: vbdsm-statistics:1.0.0
-    container_name: vbdsm-statistics
+  vber-server-acquis-ws:
+    build: ../../vbdsm-data-upload/vbdsm-acquis-ws
+    image: vbdsm-acquis-ws:2.1.0
+    container_name: vbdsm-acquis-ws
     restart: always
     ports:
-      - "9002:8080"
+      - "7100:8080"
     environment:
-      # 时区上海
       - TZ
       - SERVER_PORT
     volumes:
       # 日志文件
-      - /home/yue/vbdsm/server-logs/statistics/:/vbdsm/logs/
+      - /home/yue/vbdsm/server-logs/acquis-ws/:/vbdsm/logs/
+    privileged: true
+    networks:
+      - vbdsm-net
+      -
+  vber-server-hj212-data-collect:
+    build: ../../vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-datacollect
+    image: vbdsm-hj212-data-collect:2.1.0
+    container_name: vbdsm-hj212-data-collect
+    restart: always
+    ports:
+      # 内部使用了7221端口
+      - "7220:8080"
+    environment:
+      - TZ
+      - SERVER_PORT
+    volumes:
+      # 日志文件
+      - /home/yue/vbdsm/server-logs/hj212-datacollect/:/vbdsm/logs/
+    privileged: true
+    networks:
+      - vbdsm-net
+
+  vber-server-hj212-data-upload:
+    build: ../../vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-server
+    image: vbdsm-hj212-data-upload:2.1.0
+    container_name: vbdsm-hj212-data-upload
+    restart: always
+    ports:
+      # 内部使用了7221端口
+      - "7777:8080"
+    environment:
+      - TZ
+      - SERVER_PORT
+    volumes:
+      # 日志文件
+      - /home/yue/vbdsm/server-logs/hj212-upload/:/vbdsm/logs/
     privileged: true
-    # network_mode: "host"
     networks:
       - vbdsm-net
 
-#
 networks:
   vbdsm-net:
     external: false

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-datacollect/Dockerfile

@@ -0,0 +1,20 @@
+FROM tomcat:8.5.38
+MAINTAINER Vber
+
+RUN rm -rf webapps
+
+
+FROM openjdk:8-jre-slim
+MAINTAINER Vber
+
+ENV PARAMS="--server.port=8080"
+
+RUN mkdir -p /vbdsm/logs
+
+ENV TZ=Asia/Shanghai
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+ADD ./target/vbdsm-hj212-datacollect-*.jar /app.jar
+WORKDIR /vbdsm/logs
+
+ENTRYPOINT ["sh","-c","java -jar $JAVA_OPTS /app.jar $PARAMS"]

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-server/Dockerfile

@@ -0,0 +1,20 @@
+FROM tomcat:8.5.38
+MAINTAINER Vber
+
+RUN rm -rf webapps
+
+
+FROM openjdk:8-jre-slim
+MAINTAINER Vber
+
+ENV PARAMS="--server.port=8080"
+
+RUN mkdir -p /vbdsm/logs
+
+ENV TZ=Asia/Shanghai
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+ADD ./target/vbdsm-hj212-server-*.jar /app.jar
+WORKDIR /vbdsm/logs
+
+ENTRYPOINT ["sh","-c","java -jar $JAVA_OPTS /app.jar $PARAMS"]

VB_DSM_V2.1/vbdsm-job/xxl-job-admin/Dockerfile

@@ -1,11 +1,20 @@
+FROM tomcat:8.5.38
+MAINTAINER Vber
+
+RUN rm -rf webapps
+
+
 FROM openjdk:8-jre-slim
-MAINTAINER xuxueli
+MAINTAINER Vber
+
+ENV PARAMS="--server.port=8080"
 
-ENV PARAMS=""
+RUN mkdir -p /vbdsm/logs
 
-ENV TZ=PRC
+ENV TZ=Asia/Shanghai
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-ADD target/xxl-job-admin-*.jar /app.jar
+ADD ./target/xxl-job-admin-*.jar /app.jar
+WORKDIR /vbdsm/logs
 
-ENTRYPOINT ["sh","-c","java -jar $JAVA_OPTS /app.jar $PARAMS"]
+ENTRYPOINT ["sh","-c","java -jar $JAVA_OPTS /app.jar $PARAMS"]

VB_DSM_V2.1/vbdsm-statistics/vbdsm-statistic/Dockerfile

@@ -15,7 +15,7 @@ RUN mkdir -p /vbdsm/logs
 ENV TZ=Asia/Shanghai
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-ADD ./target/vbdsm-statistics-2.0.0.jar /app.jar
+ADD ./target/vbdsm-statistics-*.jar /app.jar
 
 WORKDIR /vbdsm/logs
 

VB_DSM_V2.1/vbdsm-web/vbdsm-gov-new/Dockerfile

@@ -14,7 +14,7 @@ RUN mkdir -p /vbdsm/logs
 ENV TZ=Asia/Shanghai
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-ADD ./target/vbdsm-gov-new-2.0.0.jar /app.jar
+ADD ./target/vbdsm-gov-new-*.jar /app.jar
 WORKDIR /vbdsm/logs
 
 ENTRYPOINT ["sh","-c","java -jar $JAVA_OPTS /app.jar $PARAMS"]