From 6de761d1c3cc50ea908885bb89a5a4017700075b Mon Sep 17 00:00:00 2001
From: chenparty <870300816@qq.com>
Date: 星期二, 09 十一月 2021 12:02:06 +0800
Subject: [PATCH] 修复command字段接口文档类型

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

diff --git a/DOCKERFILE b/DOCKERFILE
index a87279e..af42166 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
 
@@ -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