From a0537d74df5b9c8ee65dba7c4e5bc6da7fc3d031 Mon Sep 17 00:00:00 2001
From: mk1990 <37614016+mk1990@users.noreply.github.com>
Date: 星期四, 28 四月 2022 16:32:09 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

---
 DOCKERFILE |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/DOCKERFILE b/DOCKERFILE
index a87279e..d55e06a 100644
--- a/DOCKERFILE
+++ b/DOCKERFILE
@@ -28,10 +28,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 +41,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
@@ -68,6 +63,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
 
@@ -88,7 +84,7 @@
         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 '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  && \
@@ -128,4 +124,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