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 | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/DOCKERFILE b/DOCKERFILE
index e8b5ecf..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 && \
@@ -90,7 +85,7 @@
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 ' 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 +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