From ae9976bb3a59cc3d9952dda6d9388bb412baa158 Mon Sep 17 00:00:00 2001
From: xu-bin-bin <34916924+xu-bin-bin@users.noreply.github.com>
Date: 星期二, 24 十月 2023 09:28:16 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
DOCKERFILE | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/DOCKERFILE b/DOCKERFILE
index 6c4beb5..f2a2ffa 100644
--- a/DOCKERFILE
+++ b/DOCKERFILE
@@ -1,3 +1,6 @@
+#寰堜箙娌＄淮鎶や簡锛屽凡缁忎笌瀹氬墠鐗堟湰涓嶅尮閰�
+
+
FROM ubuntu:20.04 AS build
ARG DEBIAN_FRONTEND=noninteractive
@@ -84,7 +87,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 && \
--
Gitblit v1.8.0