Add添加tomcat自治镜像

.gitignore

@@ -70,3 +70,5 @@ obj/
 *.rar
 *.zip
 VB_DSM_V*/mock/*.json
+VB_DSM_V*/Mirror/*.gz
+VB_DSM_V*/Mirror/*.TTF

VB_DSM_V2.1/Mirror/Dockerfile

@@ -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

VB_DSM_V2.1/Scripts/Cmds/Build_IWBTomcate.run.xml

@@ -0,0 +1,20 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Build_IWBTomcate" type="docker-deploy" factoryName="dockerfile" server-name="81_L">
+    <deployment type="dockerfile">
+      <settings>
+        <option name="imageTag" value="iwbtomcat:1.0.0" />
+        <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="MIR/Dockerfile" />
+      </settings>
+    </deployment>
+    <method v="2" />
+  </configuration>
+</component>

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

@@ -175,6 +175,7 @@ services:
     volumes:
       # 日志文件
       - /home/iwb/vbdsm/server-logs/charts/:/vbdsm/logs/
+      #- /home/iwb/vbdsm/chart/server.xml:/usr/local/tomcat/conf/server.xml
     privileged: true
     networks:
       - vbdsm-net

VB_DSM_V2.1/vbdsm-web/vbdsm-charts/Dockerfile

@@ -1,19 +1,22 @@
-FROM tomcat:8.5.38
+FROM iwbtomcat:1.0.0
 MAINTAINER Vber
 
-RUN rm -rf webapps
+RUN rm -rf /usr/local/tomcat/webapps
 
 RUN mkdir -p /vbdsm/logs
 
 ENV TZ=Asia/Shanghai
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
+
 ADD ./target/ROOT.war /usr/local/tomcat/webapps/
 
 WORKDIR /vbdsm
 
 #端口
 EXPOSE 8080
+ENV JAVA_OPTS="-Dfile.encoding=UTF-8"
 
 #设置启动命令
 ENTRYPOINT ["/usr/local/tomcat/bin/catalina.sh","run"]
+CMD ["JAVA_OPTS=$JAVA_OPTS"]