Bladeren bron

Update 优化Docker上发布WEB

YueYunyun 2 jaren geleden
bovenliggende
commit
a220b1eb03

+ 39 - 0
VB_DSM_V2.1/Mirror/Dockerfile_JDK

@@ -0,0 +1,39 @@
+# 指定操作的镜像
+FROM ubuntu:22.04
+
+# 维护者信息
+MAINTAINER Vber
+
+# 将 jdk  添加到镜像ubuntu的/usr/local/目录下
+ADD ../jdk-8u381-linux-x64.tar.gz /usr/local/
+
+ENV MYPATH /usr/local
+WORKDIR $MYPATH
+# 添加环境变量
+ENV JAVA_HOME /usr/local/jdk1.8.0_381
+ENV CLASSPATH $JAVA_HOME/lib/dt.jar:$JAVA_HOME/lib/tools.jar
+ENV CATALINA_HOME /usr/local/tomcat
+ENV PATH $PATH:$JAVA_HOME/bin:$CATALINA_HOME/lib:$CATALINA_HOME/bin
+ENV TZ="Asia/Shanghai"
+ENV JAVA_OPTS="\
+-server \
+-Xms3g \
+-Xmx3g \
+-Xmn512m \
+-Xss512K \
+-Dfile.encoding=UTF-8 \
+-verbose:gc \
+-XX:+UseConcMarkSweepGC \
+-XX:MaxTenuringThreshold=10 \
+-XX:+ExplicitGCInvokesConcurrent \
+-XX:GCTimeRatio=19 \
+-XX:+UseParNewGC \
+-XX:+UseCMSCompactAtFullCollection \
+-XX:CMSFullGCsBeforeCompaction=10 \
+-XX:+CMSClassUnloadingEnabled \
+-XX:+CMSParallelRemarkEnabled \
+-XX:CMSInitiatingOccupancyFraction=50 \
+-Xnoclassgc \
+-XX:SoftRefLRUPolicyMSPerMB=0"
+
+CMD ["java","-version"]

+ 47 - 0
VB_DSM_V2.1/Mirror/Dockerfile_Tomcat

@@ -0,0 +1,47 @@
+# 指定操作的镜像
+FROM ubuntu:22.04
+
+# 维护者信息
+MAINTAINER Vber
+
+# 将 jdk 和 tomcat 添加到镜像centos的/usr/local/目录下
+ADD ../jdk-8u381-linux-x64.tar.gz /usr/local/
+ADD ../apache-tomcat-8.5.93.tar.gz /usr/local/
+
+RUN sed -i 's#http://archive.ubuntu.com/#http://mirrors.tuna.tsinghua.edu.cn/#' /etc/apt/sources.list;
+RUN apt-get update && apt-get install -y fontconfig
+COPY ../STSONG.TTF /usr/share/fonts/
+ENV MYPATH /usr/local
+WORKDIR $MYPATH
+# 添加环境变量
+ENV JAVA_HOME /usr/local/jdk1.8.0_381
+ENV CLASSPATH $JAVA_HOME/lib/dt.jar:$JAVA_HOME/lib/tools.jar
+ENV CATALINA_HOME /usr/local/tomcat
+ENV PATH $PATH:$JAVA_HOME/bin:$CATALINA_HOME/lib:$CATALINA_HOME/bin
+ENV TZ="Asia/Shanghai"
+ENV JAVA_OPTS="\
+-server \
+-Xms3g \
+-Xmx3g \
+-Xmn512m \
+-Xss512K \
+-Dfile.encoding=UTF-8 \
+-verbose:gc \
+-XX:+UseConcMarkSweepGC \
+-XX:MaxTenuringThreshold=10 \
+-XX:+ExplicitGCInvokesConcurrent \
+-XX:GCTimeRatio=19 \
+-XX:+UseParNewGC \
+-XX:+UseCMSCompactAtFullCollection \
+-XX:CMSFullGCsBeforeCompaction=10 \
+-XX:+CMSClassUnloadingEnabled \
+-XX:+CMSParallelRemarkEnabled \
+-XX:CMSInitiatingOccupancyFraction=50 \
+-Xnoclassgc \
+-XX:SoftRefLRUPolicyMSPerMB=0"
+
+# 暴露8080端口
+EXPOSE 8080
+
+# 容器启动时运行tomcat
+CMD $CATALINA_HOME/bin/catalina.sh run

+ 21 - 0
VB_DSM_V2.1/Scripts/Cmds/Build_IWBJDK.run.xml

@@ -0,0 +1,21 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Build_IWBJDK" type="docker-deploy" factoryName="dockerfile" server-name="81">
+    <deployment type="dockerfile">
+      <settings>
+        <option name="imageTag" value="iwbjdk:1.0.0" />
+        <option name="buildOnly" value="true" />
+        <option name="containerName" value="test-tomcat" />
+        <option name="portBindings">
+          <list>
+            <DockerPortBindingImpl>
+              <option name="containerPort" value="8080" />
+              <option name="hostPort" value="8080" />
+            </DockerPortBindingImpl>
+          </list>
+        </option>
+        <option name="sourceFilePath" value="Mirror/Dockerfile_JDK" />
+      </settings>
+    </deployment>
+    <method v="2" />
+  </configuration>
+</component>

+ 4 - 3
VB_DSM_V2.1/Scripts/Cmds/Build_IWBTomcate.run.xml

@@ -1,8 +1,9 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Build_IWBTomcate" type="docker-deploy" factoryName="dockerfile" server-name="81_L">
+  <configuration default="false" name="Build_IWBTomcate" type="docker-deploy" factoryName="dockerfile" server-name="81">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="iwbtomcat:1.0.0" />
+        <option name="imageTag" value="iwbtomcat:1.0.1" />
+        <option name="buildOnly" value="true" />
         <option name="containerName" value="test-tomcat" />
         <option name="portBindings">
           <list>
@@ -12,7 +13,7 @@
             </DockerPortBindingImpl>
           </list>
         </option>
-        <option name="sourceFilePath" value="Mirror/Dockerfile" />
+        <option name="sourceFilePath" value="Mirror/Dockerfile_Tomcat" />
       </settings>
     </deployment>
     <method v="2" />

+ 181 - 0
VB_DSM_V2.1/Scripts/Dockers/docker-compose-web.yml

@@ -0,0 +1,181 @@
+version: '3'
+
+services:
+  mysql:
+    image: mysql:5.7
+    container_name: vbdsm-mysql
+    restart: always
+    environment:
+      - TZ
+      - MYSQL_ROOT_PASSWORD
+    ports:
+      - "3307:3306"
+    volumes:
+      # 数据挂载
+      - /www/vbdsm/mysql/data/:/var/lib/mysql/
+      # 配置挂载
+      - /www/vbdsm/mysql/conf/my.cnf:/etc/mysql/my.cnf
+
+    privileged: true
+
+    networks:
+      - vbdsm-web-net
+
+  redis:
+    image: redis:6.2.7
+    container_name: vbdsm-redis
+    restart: always
+    ports:
+      - "6380:6379"
+    environment:
+      - TZ
+    volumes:
+      # 配置文件
+      - /www/vbdsm/redis/conf/redis.conf:/redis/redis.conf:rw
+      # 数据文件
+      - /www/vbdsm/redis/data/:/redis/data/:rw
+    command: redis-server /redis/redis.conf
+    privileged: true
+    networks:
+      - vbdsm-web-net
+
+  vber-server-web:
+    build: ../../vbdsm-web
+    image: vbdsm-web:latest
+    container_name: vbdsm-web
+    restart: always
+    ports:
+      - "7080:8080"
+    environment:
+      - TZ
+      - SERVER_PORT
+    volumes:
+      # 日志文件
+      - /www/vbdsm/server-logs/web/:/vbdsm/logs/
+    privileged: true
+    networks:
+      - vbdsm-web-net
+
+
+  vber-server-analysis:
+    build: ../../vbdsm-statistics/vbdsm-analysis
+    image: vbdsm-analysis:latest
+    container_name: vbdsm-analysis
+    restart: always
+    ports:
+      - "7090:8080"
+    environment:
+      TZ: Asia/Shanghai
+    volumes:
+      # 日志文件
+      - /www/vbdsm/server-logs/analysis/:/vbdsm/logs/
+    privileged: true
+    networks:
+      - vbdsm-web-net
+
+
+  vber-server-xxl-job:
+    build: ../../vbdsm-job
+    image: vbdsm-job:latest
+    container_name: vbdsm-job
+    restart: always
+    ports:
+      - "7200:7200"
+    environment:
+      # SERVER_PORT: 7200
+      TZ: Asia/Shanghai
+      PARAMS: 
+        --server.port=7200 
+        --spring.profiles.active=test
+        --spring.datasource.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_xxl_job?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+    volumes:
+      # 日志文件
+      - /www/vbdsm/server-logs/job/:/vbdsm/logs/
+    privileged: true
+    networks:
+      - vbdsm-web-net
+
+
+  vber-server-statistics:
+    build: ../../vbdsm-statistics/vbdsm-statistic
+    image: vbdsm-statistics:latest
+    container_name: vbdsm-statistics
+    restart: always
+    ports:
+      # 内部使用了7211端口
+      - "7210:7210"
+    environment:
+      # 时区上海
+      TZ: Asia/Shanghai
+      PARAMS: --server.port=7210 --xxl.job.admin.addresses=http://vbdsm-job:7200
+    volumes:
+      # 日志文件
+      - /www/vbdsm/server-logs/statistics/:/vbdsm/logs/
+    privileged: true
+    networks:
+      - vbdsm-web-net
+  
+  
+  vber-server-hj212-data-collect:
+    build: ../../vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-datacollect
+    image: vbdsm-hj212-data-collect:latest
+    container_name: vbdsm-hj212-data-collect
+    restart: always
+    ports:
+      # 内部使用了7221端口
+      - "7220:7220"
+    environment:
+      TZ: Asia/Shanghai
+      PARAMS:
+        --server.port=7220 
+        --xxl.job.admin.addresses=http://vbdsm-job:7200
+    volumes:
+      # 日志文件
+      - /www/vbdsm/server-logs/hj212-datacollect/:/vbdsm/logs/
+    privileged: true
+    networks:
+      - vbdsm-web-net
+
+  vber-server-hj212-data-server:
+    build: ../../vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-server
+    image: vbdsm-hj212-data-server:latest
+    container_name: vbdsm-hj212-data-server
+    restart: always
+#    ports:
+#      # 内部使用了7221端口
+#      - "7776:8080"
+    environment:
+      TZ: Asia/Shanghai
+      PARAMS:
+        --vbdsm.socket.server.bindPort=7777
+    volumes:
+      # 日志文件
+      - /www/vbdsm/server-logs/hj212-upload/:/vbdsm/logs/
+    privileged: true
+    networks:
+      - vbdsm-web-net
+
+  vber-server-hj212-modbus-test:
+    build: ../../vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-modbus
+    image: vbdsm-hj212-mockdata-upload:latest
+    container_name: vbdsm-hj212-mockdata-upload
+    restart: always
+#    ports:
+#      - "18888:7110"
+    environment:
+      TZ: Asia/Shanghai
+      PARAMS:
+        --server.port=7110
+        --vbdsm.socket.client.bindIp=vbdsm-hj212-data-server
+        --vbdsm.monitor.terminals=3@YC0001,YC0002&7@YD001_01,YD001_02&9@YD002_01,YD002_02&10@YD003_01
+    volumes:
+      # 日志文件
+      - /www/vbdsm/server-logs/hj212-upload-mockdata/:/vbdsm/logs/
+      - /www/vbdsm/hj212-upload-mockdata/mock/:/vbdsm/mock/
+    privileged: true
+    networks:
+      - vbdsm-web-net
+
+networks:
+  vbdsm-web-net:
+    external: false

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

@@ -4,7 +4,7 @@ MAINTAINER Vber
 RUN rm -rf webapps
 
 
-FROM openjdk:8-jre-slim
+FROM iwbjdk:1.0.0
 MAINTAINER Vber
 
 ENV PARAMS="--server.port=8080"

+ 39 - 11
VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-datacollect/src/main/resources/config/application-test.yml

@@ -4,8 +4,8 @@ server:
   port: 7220
 spring:
   redis:
-    host: 192.168.0.104
-    password: Iwb-2017
+    host: vbdsm-redis
+    password:
     port: 6379
     database: 3
     lettuce:
@@ -30,9 +30,9 @@ xxl:
 sharding:
   jdbc:
     datasource:
-      names: vbdsm,vbdsm-2023,vbdsm-2024
+      names: vbdsm,vbdsm-2023,vbdsm-2024,vbdsm-2025,vbdsm-2026
       vbdsm:
-        url: jdbc:mysql://47.112.30.247:13306/vbdsm?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+        url: jdbc:mysql://vbdsm-mysql:3306/vbdsm?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
         username: root
         password: 123456
         driverClassName: com.mysql.jdbc.Driver
@@ -46,7 +46,7 @@ sharding:
         testWhileIdle: true
         maxActive: 30
       vbdsm-2023:
-        url: jdbc:mysql://47.112.30.247:13306/vbdsm_2023?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+        url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_2023?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
         username: root
         password: 123456
         driverClassName: com.mysql.jdbc.Driver
@@ -60,7 +60,35 @@ sharding:
         testWhileIdle: true
         maxActive: 30
       vbdsm-2024:
-        url: jdbc:mysql://47.112.30.247:13306/vbdsm_2024?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+        url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_2024?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+        username: root
+        password: 123456
+        driverClassName: com.mysql.jdbc.Driver
+        minIdle: 10
+        validationQuery: SELECT 1
+        initialSize: 5
+        maxWait: 60000
+        filters: stat
+        poolPreparedStatements: true
+        type: com.alibaba.druid.pool.DruidDataSource
+        testWhileIdle: true
+        maxActive: 30
+      vbdsm-2025:
+        url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_2025?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+        username: root
+        password: 123456
+        driverClassName: com.mysql.jdbc.Driver
+        minIdle: 10
+        validationQuery: SELECT 1
+        initialSize: 5
+        maxWait: 60000
+        filters: stat
+        poolPreparedStatements: true
+        type: com.alibaba.druid.pool.DruidDataSource
+        testWhileIdle: true
+        maxActive: 30
+      vbdsm-2026:
+        url: jdbc:mysql://vbdsm-mysql:3306/vbdsm_2026?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
         username: root
         password: 123456
         driverClassName: com.mysql.jdbc.Driver
@@ -77,7 +105,7 @@ sharding:
       sharding:
         tables:
           t_online_data_energy:
-            actualDataNodes: vbdsm-${2023..2024}.t_online_data_energy_0${1..9},vbdsm-${2023..2024}.t_online_data_energy_${10..12}
+            actualDataNodes: vbdsm-${2023..2026}.t_online_data_energy_0${1..9},vbdsm-${2023..2026}.t_online_data_energy_${10..12}
             tableStrategy:
               standard:
                 rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeTableShardingAlgorithm
@@ -89,7 +117,7 @@ sharding:
                 shardingColumn: getTime
                 preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseDatabaseShardingAlgorithm
           t_online_data_power:
-            actualDataNodes: vbdsm-${2023..2024}.t_online_data_power_0${1..9},vbdsm-${2023..2024}.t_online_data_power_${10..12}
+            actualDataNodes: vbdsm-${2023..2026}.t_online_data_power_0${1..9},vbdsm-${2023..2026}.t_online_data_power_${10..12}
             tableStrategy:
               standard:
                 rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeTableShardingAlgorithm
@@ -106,7 +134,7 @@ sharding:
                 rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeTableShardingAlgorithm
                 shardingColumn: getTime
                 preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseTableShardingAlgorithm
-            actualDataNodes: vbdsm-${2023..2024}.t_online_data_qty_0${1..9},vbdsm-${2023..2024}.t_online_data_qty_${10..12}
+            actualDataNodes: vbdsm-${2023..2026}.t_online_data_qty_0${1..9},vbdsm-${2023..2026}.t_online_data_qty_${10..12}
             databaseStrategy:
               standard:
                 rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeDatabaseShardingAlgorithm
@@ -118,7 +146,7 @@ sharding:
                 rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeTableShardingAlgorithm
                 shardingColumn: getTime
                 preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseTableShardingAlgorithm
-            actualDataNodes: vbdsm-${2023..2024}.t_online_data_harmonic_i_0${1..9},vbdsm-${2023..2024}.t_online_data_harmonic_i_${10..12}
+            actualDataNodes: vbdsm-${2023..2026}.t_online_data_harmonic_i_0${1..9},vbdsm-${2023..2026}.t_online_data_harmonic_i_${10..12}
             databaseStrategy:
               standard:
                 rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeDatabaseShardingAlgorithm
@@ -130,7 +158,7 @@ sharding:
                 rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeTableShardingAlgorithm
                 shardingColumn: getTime
                 preciseAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.PreciseTableShardingAlgorithm
-            actualDataNodes: vbdsm-${2023..2024}.t_online_data_harmonic_u_0${1..9},vbdsm-${2023..2024}.t_online_data_harmonic_u_${10..12}
+            actualDataNodes: vbdsm-${2023..2026}.t_online_data_harmonic_u_0${1..9},vbdsm-${2023..2026}.t_online_data_harmonic_u_${10..12}
             databaseStrategy:
               standard:
                 rangeAlgorithmClassName: cn.vbdsm.hj212.datacollect.sharding.RangeDatabaseShardingAlgorithm

+ 2 - 2
VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-modbus/Dockerfile

@@ -1,5 +1,5 @@
-#FROM openjdk:8-jre-slim
-FROM iwbnet.jdk8:202
+FROM iwbjdk:1.0.0
+#FROM iwbnet.jdk8:202
 MAINTAINER Vber
 
 ENV PARAMS="--server.port=8080"

+ 3 - 2
VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-modbus/src/main/java/cn/vbdsm/hj212/modbus/ws/MockUploadTcpService.java

@@ -49,6 +49,7 @@ public class MockUploadTcpService {
             String[] ts = cts[1].split(",");
             for(String t : ts){
                 TerminalData td = getTerminal(cts[0],t);
+                log.info("终端:{} HOST:{} PORT:{}", t, host, port);
                 TcpSocketClient client = new TcpSocketClient(host,Integer.parseInt(port),td);
                 clients.add(client);
                 //client.Connect();
@@ -71,8 +72,8 @@ public class MockUploadTcpService {
             setEngine(power,td);
             try {
                 String nowStr = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
-                //long now = Long.parseLong(nowStr);
-                long now = Long.parseLong("20240801123030");
+                long now = Long.parseLong(nowStr);
+                //long now = Long.parseLong("20240801123030");
                 now = now - (now - (now / 10000) * 10000) % 500;
                 uploadData(client,td,power,now);
                 Thread.sleep(500);

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

@@ -4,7 +4,7 @@ MAINTAINER Vber
 RUN rm -rf webapps
 
 
-FROM openjdk:8-jre-slim
+FROM iwbjdk:1.0.0
 MAINTAINER Vber
 
 ENV PARAMS="--server.port=8080"

+ 2 - 2
VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-server/src/main/resources/config/application-test.yml

@@ -9,8 +9,8 @@ vbdsm:
 
 spring:
   redis:
-    host: 192.168.0.104
-    password: Iwb-2017
+    host: vbdsm-redis
+    password:
     port: 6379
     database: 3
     lettuce:

+ 1 - 1
VB_DSM_V2.1/vbdsm-job/Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:8-jre-slim
+FROM iwbjdk:1.0.0
 MAINTAINER Vber
 
 ENV PARAMS="--server.port=8080"

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

@@ -1,4 +1,4 @@
-FROM openjdk:8-jre-slim
+FROM iwbjdk:1.0.0
 MAINTAINER Vber
 
 ENV PARAMS="--server.port=8080"

+ 1 - 1
VB_DSM_V2.1/vbdsm-job/xxl-job-admin/src/main/resources/application-test.properties

@@ -18,7 +18,7 @@ spring.freemarker.settings.number_format=0.##########
 mybatis.mapper-locations=classpath:/mybatis-mapper/*Mapper.xml
 #mybatis.type-aliases-package=com.xxl.job.admin.core.model
 ### xxl-job, datasource
-spring.datasource.url=jdbc:mysql://47.112.30.247:23306/vbdsm_xxl_job?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false
+spring.datasource.url=jdbc:mysql://vbdsm-mysql:3306/vbdsm_xxl_job?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false
 spring.datasource.username=root
 spring.datasource.password=123456
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver

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

@@ -1,5 +1,5 @@
 
-FROM openjdk:8-jre-slim
+FROM iwbjdk:1.0.0
 MAINTAINER Vber
 
 ENV PARAMS="--server.port=8080"

+ 2 - 2
VB_DSM_V2.1/vbdsm-statistics/vbdsm-statistic/src/main/resources/logback.xml

@@ -12,7 +12,7 @@
 
     <appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <FileNamePattern>D:/logs/vbdsm/${appName}/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <FileNamePattern>/vbdsm/logs/${appName}/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
             <maxFileSize>100MB</maxFileSize>
             <maxHistory>30</maxHistory>
             <totalSizeCap>2GB</totalSizeCap>
@@ -30,7 +30,7 @@
 
     <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <FileNamePattern>D:/logs/vbdsm/${appName}/%d{yyyy-MM-dd}.%i.error.log</FileNamePattern>
+            <FileNamePattern>/vbdsm/logs/${appName}/%d{yyyy-MM-dd}.%i.error.log</FileNamePattern>
             <maxFileSize>100MB</maxFileSize>
             <maxHistory>30</maxHistory>
             <totalSizeCap>2GB</totalSizeCap>

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

@@ -1,4 +1,4 @@
-FROM openjdk:8-jre-slim
+FROM iwbjdk:1.0.0
 MAINTAINER Vber
 
 ENV PARAMS="--server.port=8080"