From 6ac131bcf6ec034ffc9e5813c68c56c6e5c32b70 Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期三, 01 十二月 2021 22:45:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
DOCKERFILE | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/DOCKERFILE b/DOCKERFILE
index e8b5ecf..96bc29b 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
@@ -129,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