From 3c0dde2f3c6beb441184b033f1e3c6369100c0b5 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 29 十一月 2021 18:09:19 +0800
Subject: [PATCH] 修复兼容接口
---
DOCKERFILE | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/DOCKERFILE b/DOCKERFILE
index 3e53284..c703174 100644
--- a/DOCKERFILE
+++ b/DOCKERFILE
@@ -1,5 +1,7 @@
FROM ubuntu:20.04 AS build
+# DEBIAN_FRONTEND杩欎釜鐜鍙橀噺锛屽憡鐭ユ搷浣滅郴缁熷簲璇ヤ粠鍝効鑾峰緱鐢ㄦ埛杈撳叆銆�
+# 濡傛灉璁剧疆涓衡�漬oninteractive鈥濓紝浣犲氨鍙互鐩存帴杩愯鍛戒护锛岃�屾棤闇�鍚戠敤鎴疯姹傝緭鍏ワ紙鎵�鏈夋搷浣滈兘鏄潪浜や簰寮忕殑锛夈��
ARG DEBIAN_FRONTEND=noninteractive
ENV TZ=Asia/Shanghai
@@ -28,25 +30,25 @@
cmake curl vim ca-certificates tzdata libmysqlclient-dev redis-server libssl-dev libx264-dev libfaac-dev ffmpeg
WORKDIR /home
-RUN git clone https://gitee.com/18010473990/maven.git && \
+RUN git clone https://gitee.com/pan648540858/maven.git && \
cp maven/settings.xml /usr/share/maven/conf/ && \
- git clone https://gitee.com/18010473990/wvp-GB28181.git && \
- git clone https://gitee.com/18010473990/wvp-pro-assist.git
+ git clone https://gitee.com/pan648540858/wvp-GB28181-pro.git && \
+ git clone https://gitee.com/pan648540858/wvp-pro-assist.git
# 缂栬瘧鍓嶇鐣岄潰
-WORKDIR /home/wvp-GB28181/web_src
+WORKDIR /home/wvp-GB28181-pro/web_src
RUN npm install && \
npm run build && \
mkdir -p /opt/wvp/config && \
mkdir -p /opt/assist/config && \
- cp /home/wvp-GB28181/src/main/resources/application-dev.yml /opt/wvp/config/application.yml && \
+ cp /home/wvp-GB28181-pro/src/main/resources/application-docker.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
+WORKDIR /home/wvp-GB28181-pro
RUN mvn compile && \
mvn package && \
- cp /home/wvp-GB28181/target/wvp*.jar /opt/wvp/
+ cp /home/wvp-GB28181-pro/target/wvp*.jar /opt/wvp/
# wvp 褰曞儚绠＄悊鎵撳寘
WORKDIR /home/wvp-pro-assist
@@ -70,7 +72,7 @@
# 娓呯悊
RUN rm -rf /home/wiki && \
- rm -rf /home/wvp-GB28181 && \
+ rm -rf /home/wvp-GB28181-pro && \
apt-get autoremove -y git maven nodejs npm && \
apt-get clean -y && \
rm -rf /var/lib/apt/lists/*dic
@@ -87,7 +89,7 @@
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 '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.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.hook-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