From 01322572bbb74060df0154644f36f5e76849e40c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 19 十一月 2021 17:20:17 +0800
Subject: [PATCH] 修复docker镜像hookip
---
DOCKERFILE | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/DOCKERFILE b/DOCKERFILE
index a87279e..f547428 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
@@ -42,11 +44,6 @@
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
-RUN npm install && \
- npm run build && \
- mkdir -p /opt/wvp/config && \
- cp /home/wvp-GB28181/src/main/resources/application-dev.yml /opt/wvp/config/application.yml
-
# wvp鎵撳寘
WORKDIR /home/wvp-GB28181
RUN mvn compile && \
@@ -68,6 +65,7 @@
cd build && \
cmake -DCMAKE_BUILD_TYPE=Release .. && \
make -j4 && \
+ rm -rf ../release/linux/Release/config.ini && \
cp -r ../release/linux/Release/* /opt/media && \
mkdir -p /opt/media/www/record
@@ -91,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
@@ -128,4 +126,4 @@
WORKDIR /opt/wvp
COPY --from=build /opt /opt
-CMD ["sh", "run.sh"]
\ No newline at end of file
+CMD ["sh", "run.sh"]
--
Gitblit v1.8.0