Fix Docker Compose

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

@@ -58,10 +58,10 @@ services:
       - TZ
     volumes:
       # 配置文件
-      - /home/iwb/vbdsm/redis/conf/:/redis/config/:rw
+      - /home/iwb/vbdsm/redis/conf/redis.conf:/redis/redis.conf:rw
       # 数据文件
       - /home/iwb/vbdsm/redis/data/:/redis/data/:rw
-    command: "redis-server /redis/config/redis.conf"
+    command: redis-server /redis/redis.conf
     privileged: true
     networks:
       - vbdsm-net
@@ -240,7 +240,7 @@ services:
     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

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

@@ -1,9 +1,3 @@
-FROM tomcat:8.5.38
-MAINTAINER Vber
-
-RUN rm -rf webapps
-
-
 
 FROM openjdk:8-jre-slim
 MAINTAINER Vber
@@ -15,7 +9,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-*.jar /app.jar
+ADD ./target/vbdsm-statistic-*.jar /app.jar
 
 WORKDIR /vbdsm/logs
 

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

@@ -1,9 +1,3 @@
-FROM tomcat:8.5.38
-MAINTAINER Vber
-
-RUN rm -rf webapps
-
-
 FROM openjdk:8-jre-slim
 MAINTAINER Vber