|
|
@@ -62,7 +62,7 @@ services:
|
|
|
|
|
|
vber-server-passport:
|
|
|
build: ../../vbdsm-web/vbdsm-passport
|
|
|
- image: vbdsm-passport:2.1.0
|
|
|
+ image: vbdsm-passport:2.1.2
|
|
|
container_name: vbdsm-passport
|
|
|
restart: always
|
|
|
ports:
|
|
|
@@ -79,7 +79,7 @@ services:
|
|
|
|
|
|
vber-server-manage:
|
|
|
build: ../../vbdsm-web/vbdsm-manage
|
|
|
- image: vbdsm-manage:2.1.0
|
|
|
+ image: vbdsm-manage:2.1.2
|
|
|
container_name: vbdsm-manage
|
|
|
restart: always
|
|
|
ports:
|
|
|
@@ -96,7 +96,7 @@ services:
|
|
|
|
|
|
vber-server-powerservice:
|
|
|
build: ../../vbdsm-web/vbdsm-powerservice
|
|
|
- image: vbdsm-powerservice:2.1.0
|
|
|
+ image: vbdsm-powerservice:2.1.2
|
|
|
container_name: vbdsm-powerservice
|
|
|
restart: always
|
|
|
ports:
|
|
|
@@ -113,7 +113,7 @@ services:
|
|
|
|
|
|
vber-server-gov:
|
|
|
build: ../../vbdsm-web/vbdsm-gov
|
|
|
- image: vbdsm-gov:2.1.0
|
|
|
+ image: vbdsm-gov:2.1.2
|
|
|
container_name: vbdsm-gov
|
|
|
restart: always
|
|
|
ports:
|
|
|
@@ -130,7 +130,7 @@ services:
|
|
|
|
|
|
vber-server-gov-new:
|
|
|
build: ../../vbdsm-web/vbdsm-gov-new
|
|
|
- image: vbdsm-gov-new:2.1.0
|
|
|
+ image: vbdsm-gov-new:2.1.2
|
|
|
container_name: vbdsm-gov-new
|
|
|
restart: always
|
|
|
ports:
|
|
|
@@ -147,7 +147,7 @@ services:
|
|
|
|
|
|
vber-server-explorer:
|
|
|
build: ../../vbdsm-web/vbdsm-explorer
|
|
|
- image: vbdsm-explorer:2.1.0
|
|
|
+ image: vbdsm-explorer:2.1.2
|
|
|
container_name: vbdsm-explorer
|
|
|
restart: always
|
|
|
ports:
|
|
|
@@ -163,16 +163,31 @@ services:
|
|
|
networks:
|
|
|
- vbdsm-net
|
|
|
|
|
|
+ vber-server-charts:
|
|
|
+ build: ../../vbdsm-web/vbdsm-charts
|
|
|
+ image: vbdsm-charts:2.1.2
|
|
|
+ container_name: vbdsm-charts
|
|
|
+ restart: always
|
|
|
+ ports:
|
|
|
+ - "7087:8080"
|
|
|
+ environment:
|
|
|
+ TZ: Asia/Shanghai
|
|
|
+ volumes:
|
|
|
+ # 日志文件
|
|
|
+ - /home/iwb/vbdsm/server-logs/charts/:/vbdsm/logs/
|
|
|
+ privileged: true
|
|
|
+ networks:
|
|
|
+ - vbdsm-net
|
|
|
+
|
|
|
vber-server-analysis:
|
|
|
build: ../../vbdsm-statistics/vbdsm-analysis
|
|
|
- image: vbdsm-analysis:2.1.0
|
|
|
+ image: vbdsm-analysis:2.1.2
|
|
|
container_name: vbdsm-analysis
|
|
|
restart: always
|
|
|
ports:
|
|
|
- - "7087:8080"
|
|
|
+ - "7090:8080"
|
|
|
environment:
|
|
|
- - TZ
|
|
|
- - SERVER_PORT
|
|
|
+ TZ: Asia/Shanghai
|
|
|
volumes:
|
|
|
# 日志文件
|
|
|
- /home/iwb/vbdsm/server-logs/analysis/:/vbdsm/logs/
|
|
|
@@ -183,14 +198,15 @@ services:
|
|
|
|
|
|
vber-server-xxl-job:
|
|
|
build: ../../vbdsm-job
|
|
|
- image: vbdsm-job:2.1.0
|
|
|
+ image: vbdsm-job:2.1.2
|
|
|
container_name: vbdsm-job
|
|
|
restart: always
|
|
|
ports:
|
|
|
- - "7200:8080"
|
|
|
+ - "7200:7200"
|
|
|
environment:
|
|
|
- - TZ
|
|
|
- - SERVER_PORT
|
|
|
+ # SERVER_PORT: 7200
|
|
|
+ TZ: Asia/Shanghai
|
|
|
+ PARAMS: --server.port=7200 --spring.datasource.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_xxl_job?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
|
|
|
volumes:
|
|
|
# 日志文件
|
|
|
- /home/iwb/vbdsm/server-logs/job/:/vbdsm/logs/
|
|
|
@@ -201,16 +217,16 @@ services:
|
|
|
|
|
|
vber-server-statistics:
|
|
|
build: ../../vbdsm-statistics/vbdsm-statistic
|
|
|
- image: vbdsm-statistics:2.1.0
|
|
|
+ image: vbdsm-statistics:2.1.2
|
|
|
container_name: vbdsm-statistics
|
|
|
restart: always
|
|
|
ports:
|
|
|
# 内部使用了7211端口
|
|
|
- - "7210:8080"
|
|
|
+ - "7210:7210"
|
|
|
environment:
|
|
|
# 时区上海
|
|
|
- - TZ
|
|
|
- - SERVER_PORT
|
|
|
+ TZ: Asia/Shanghai
|
|
|
+ PARAMS: --server.port=7210 --xxl.job.admin.addresses=http://vbdsm-job:7200
|
|
|
volumes:
|
|
|
# 日志文件
|
|
|
- /home/iwb/vbdsm/server-logs/statistics/:/vbdsm/logs/
|
|
|
@@ -253,15 +269,16 @@ services:
|
|
|
|
|
|
vber-server-hj212-data-collect:
|
|
|
build: ../../vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-datacollect
|
|
|
- image: vbdsm-hj212-data-collect:2.1.0
|
|
|
+ image: vbdsm-hj212-data-collect:2.1.2
|
|
|
container_name: vbdsm-hj212-data-collect
|
|
|
restart: always
|
|
|
ports:
|
|
|
# 内部使用了7221端口
|
|
|
- - "7220:8080"
|
|
|
+ - "7220:7220"
|
|
|
environment:
|
|
|
- - TZ
|
|
|
- - SERVER_PORT
|
|
|
+ #SERVER_PORT: 7220
|
|
|
+ TZ: Asia/Shanghai
|
|
|
+ PARAMS: --server.port=7220 --xxl.job.admin.addresses=http://vbdsm-job:7200
|
|
|
volumes:
|
|
|
# 日志文件
|
|
|
- /home/iwb/vbdsm/server-logs/hj212-datacollect/:/vbdsm/logs/
|
|
|
@@ -271,15 +288,15 @@ services:
|
|
|
|
|
|
vber-server-hj212-data-upload:
|
|
|
build: ../../vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-server
|
|
|
- image: vbdsm-hj212-data-upload:2.1.0
|
|
|
+ image: vbdsm-hj212-data-upload:2.1.2
|
|
|
container_name: vbdsm-hj212-data-upload
|
|
|
restart: always
|
|
|
ports:
|
|
|
# 内部使用了7221端口
|
|
|
- - "7777:8080"
|
|
|
+ - "7776:8080"
|
|
|
environment:
|
|
|
- - TZ
|
|
|
- - SERVER_PORT
|
|
|
+ TZ: Asia/Shanghai
|
|
|
+ PARAMS: --vbdsm.socket.server.bindPort=7777
|
|
|
volumes:
|
|
|
# 日志文件
|
|
|
- /home/iwb/vbdsm/server-logs/hj212-upload/:/vbdsm/logs/
|
|
|
@@ -289,7 +306,7 @@ services:
|
|
|
|
|
|
vber-server-hj212-modbus-test:
|
|
|
build: ../../vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-modbus
|
|
|
- image: vbdsm-hj212-mockdata-upload:2.1.0
|
|
|
+ image: vbdsm-hj212-mockdata-upload:2.1.2
|
|
|
container_name: vbdsm-hj212-mockdata-upload
|
|
|
restart: always
|
|
|
ports:
|