From 78b39ebd5a99da3dca367b4ed3ee2c97e91a333c Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期五, 05 十一月 2021 22:44:10 +0800
Subject: [PATCH] 尝试docker-compose启动

---
 DOCKERFILE |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/DOCKERFILE b/DOCKERFILE
index a87279e..3e53284 100644
--- a/DOCKERFILE
+++ b/DOCKERFILE
@@ -42,11 +42,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 +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
 
@@ -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