From 1af77ab5f7c11a4b3d59c1989b51b9fca29679ce Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 18 十月 2022 22:18:49 +0800
Subject: [PATCH] Merge pull request #645 from IKangXu/wvp-28181-2.0
---
DOCKERFILE | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/DOCKERFILE b/DOCKERFILE
index e8b5ecf..f2a2ffa 100644
--- a/DOCKERFILE
+++ b/DOCKERFILE
@@ -1,3 +1,6 @@
+#寰堜箙娌＄淮鎶や簡锛屽凡缁忎笌瀹氬墠鐗堟湰涓嶅尮閰�
+
+
FROM ubuntu:20.04 AS build
ARG DEBIAN_FRONTEND=noninteractive
@@ -28,10 +31,10 @@
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.git && \
+ git clone https://gitee.com/pan648540858/wvp-pro-assist.git
# 缂栬瘧鍓嶇鐣岄潰
WORKDIR /home/wvp-GB28181/web_src
@@ -41,11 +44,6 @@
mkdir -p /opt/assist/config && \
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
@@ -89,8 +87,8 @@
echo 'nohup java -jar *.jar --userSettings.record=/opt/media/www/record/ &' >> run.sh && \
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.confi g.location=/opt/wvp/config/application.yml --media.record-assist-port=18081 ${WVP_CONFIG}' >> run.sh && \
+ echo 'if [-n "${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 'fi' >> run.sh
@@ -129,4 +127,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