From a1398a56cc3587f08c28032a5c00f4c71b48e4f7 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期四, 02 十二月 2021 09:33:20 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 --- DOCKERFILE | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/DOCKERFILE b/DOCKERFILE index c703174..96bc29b 100644 --- a/DOCKERFILE +++ b/DOCKERFILE @@ -1,7 +1,5 @@ FROM ubuntu:20.04 AS build -# DEBIAN_FRONTEND杩欎釜鐜鍙橀噺锛屽憡鐭ユ搷浣滅郴缁熷簲璇ヤ粠鍝効鑾峰緱鐢ㄦ埛杈撳叆銆� -# 濡傛灉璁剧疆涓衡�漬oninteractive鈥濓紝浣犲氨鍙互鐩存帴杩愯鍛戒护锛岃�屾棤闇�鍚戠敤鎴疯姹傝緭鍏ワ紙鎵�鏈夋搷浣滈兘鏄潪浜や簰寮忕殑锛夈�� ARG DEBIAN_FRONTEND=noninteractive ENV TZ=Asia/Shanghai @@ -32,23 +30,23 @@ RUN git clone https://gitee.com/pan648540858/maven.git && \ cp maven/settings.xml /usr/share/maven/conf/ && \ - git clone https://gitee.com/pan648540858/wvp-GB28181-pro.git && \ + git clone https://gitee.com/pan648540858/wvp-GB28181.git && \ git clone https://gitee.com/pan648540858/wvp-pro-assist.git # 缂栬瘧鍓嶇鐣岄潰 -WORKDIR /home/wvp-GB28181-pro/web_src +WORKDIR /home/wvp-GB28181/web_src RUN npm install && \ npm run build && \ mkdir -p /opt/wvp/config && \ mkdir -p /opt/assist/config && \ - cp /home/wvp-GB28181-pro/src/main/resources/application-docker.yml /opt/wvp/config/application.yml && \ + cp /home/wvp-GB28181/src/main/resources/application-dev.yml /opt/wvp/config/application.yml && \ cp /home/wvp-pro-assist/src/main/resources/application-dev.yml /opt/assist/config/application.yml # wvp鎵撳寘 -WORKDIR /home/wvp-GB28181-pro +WORKDIR /home/wvp-GB28181 RUN mvn compile && \ mvn package && \ - cp /home/wvp-GB28181-pro/target/wvp*.jar /opt/wvp/ + cp /home/wvp-GB28181/target/wvp*.jar /opt/wvp/ # wvp 褰曞儚绠$悊鎵撳寘 WORKDIR /home/wvp-pro-assist @@ -72,7 +70,7 @@ # 娓呯悊 RUN rm -rf /home/wiki && \ - rm -rf /home/wvp-GB28181-pro && \ + rm -rf /home/wvp-GB28181 && \ apt-get autoremove -y git maven nodejs npm && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/*dic @@ -87,9 +85,9 @@ echo 'nohup /opt/media/MediaServer -d -m 3 &' >> run.sh && \ echo 'cd /opt/wvp' >> run.sh && \ echo 'if [${WVP_CONFIG}]; then' >> 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 -jar *.jar --spring.confi g.location=/opt/wvp/config/application.yml --media.record-assist-port=18081 ${WVP_CONFIG}' >> run.sh && \ echo 'else' >> run.sh && \ - echo ' java -jar *.jar --spring.config.location=/opt/wvp/config/application.yml --media.record-assist-port=18081 --media.ip=127.0.0.1 --media.hook-ip=127.0.0.1 --media.sdp-ip=${WVP_IP} --sip.ip=${WVP_IP} --media.stream-ip=${WVP_IP}' >> run.sh && \ + echo ' java -jar *.jar --spring.config.location=/opt/wvp/config/application.yml --media.record-assist-port=18081 --media.ip=127.0.0.1 --media.sdp-ip=${WVP_IP} --sip.ip=${WVP_IP} --media.stream-ip=${WVP_IP}' >> run.sh && \ echo 'fi' >> run.sh RUN chmod +x run.sh -- Gitblit v1.8.0