From ffb0fcb9072a043c333837fa83bd976b03fea091 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期四, 02 十二月 2021 09:30:57 +0800 Subject: [PATCH] Merge pull request #259 from hotcoffie/wvp-28181-2.0 --- docker/wvp/Dockerfile | 33 ++++++++++++++++++--------------- 1 files changed, 18 insertions(+), 15 deletions(-) diff --git a/docker/wvp/Dockerfile b/docker/wvp/Dockerfile index 16d0c81..34e3bab 100644 --- a/docker/wvp/Dockerfile +++ b/docker/wvp/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 AS build +FROM ubuntu:20.04 as build ARG gitUrl="https://gitee.com/pan648540858" ARG zlmGitUrl="https://gitee.com/xia-chu/ZLMediaKit" @@ -6,30 +6,33 @@ RUN export DEBIAN_FRONTEND=noninteractive &&\ apt-get update && \ apt-get install -y --no-install-recommends openjdk-11-jre git maven nodejs npm build-essential \ - cmake ca-certificates openssl ffmpeg + cmake ca-certificates openssl ffmpeg &&\ + mkdir -p /opt/wvp/config /opt/wvp/heapdump /opt/wvp/config /opt/assist/config /opt/assist/heapdump /opt/media/www/record RUN cd /home && \ - git clone "https://gitee.com/pan648540858/maven.git" && \ - cp maven/settings.xml /usr/share/maven/conf/ && \ - git clone "${gitUrl}/wvp-GB28181-pro.git" && \ - git clone "${gitUrl}/wvp-pro-assist.git" && \ - git clone --depth=1 "${zlmGitUrl}" && \ - mkdir -p /opt/wvp/config /opt/assist/config /opt/media/www/record + git clone "${gitUrl}/maven.git" && \ + cp maven/settings.xml /usr/share/maven/conf/ -RUN cd /home/wvp-GB28181/web_src && \ +RUN cd /home && \ + git clone "${gitUrl}/wvp-GB28181-pro.git" +RUN cd /home/wvp-GB28181-pro/web_src && \ npm install && \ npm run build - -RUN cd /home/wvp-GB28181 && \ +RUN cd /home/wvp-GB28181-pro && \ mvn clean package -Dmaven.test.skip=true && \ - cp /home/wvp-GB28181/target/*.jar /opt/wvp/ && \ - cp /home/wvp-GB28181/src/main/resources/application-docker.yml /opt/wvp/config/application.yml + cp /home/wvp-GB28181-pro/target/*.jar /opt/wvp/ && \ + cp /home/wvp-GB28181-pro/src/main/resources/application-docker.yml /opt/wvp/config/application.yml +RUN cd /home && \ + git clone "${gitUrl}/wvp-pro-assist.git" RUN cd /home/wvp-pro-assist && \ + git reset --hard 58f1a79136a55a7cd1593c95b56ddadcc2225b61 && \ mvn clean package -Dmaven.test.skip=true && \ cp /home/wvp-pro-assist/target/*.jar /opt/assist/ && \ cp /home/wvp-pro-assist/src/main/resources/application-dev.yml /opt/assist/config/application.yml +RUN cd /home && \ + git clone --depth=1 "${zlmGitUrl}" RUN cd /home/ZLMediaKit && \ git submodule update --init --recursive && \ mkdir -p build release/linux/Release/ &&\ @@ -44,10 +47,10 @@ echo 'echo ${WVP_IP}' >> run.sh && \ echo 'echo ${WVP_CONFIG}' >> run.sh && \ echo 'cd /opt/assist' >> run.sh && \ - echo 'nohup java -jar *.jar --spring.config.location=/opt/assist/config/application.yml --userSettings.record=/opt/media/www/record/ --media.record-assist-port=18081 ${ASSIST_CONFIG} &' >> run.sh && \ + echo 'nohup java ${ASSIST_JVM_CONFIG} -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/assist/heapdump/ -jar *.jar --spring.config.location=/opt/assist/config/application.yml --userSettings.record=/opt/media/www/record/ --media.record-assist-port=18081 ${ASSIST_CONFIG} &' >> run.sh && \ echo 'nohup /opt/media/MediaServer -d -m 3 &' >> run.sh && \ echo 'cd /opt/wvp' >> run.sh && \ - echo 'java -jar *.jar --spring.config.location=/opt/wvp/config/application.yml --media.record-assist-port=18081 ${WVP_CONFIG}' >> run.sh && \ + echo 'java ${WVP_JVM_CONFIG} -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/wvp/heapdump/ -jar *.jar --spring.config.location=/opt/wvp/config/application.yml --media.record-assist-port=18081 ${WVP_CONFIG}' >> run.sh && \ chmod +x run.sh FROM ubuntu:20.04 -- Gitblit v1.8.0