From d8c3638ac856ae24838457e461a1672e6e4ae70b Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期五, 05 十一月 2021 20:45:44 +0800
Subject: [PATCH] 尝试docker-compose启动
---
docker/wvp/Dockerfile | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/docker/wvp/Dockerfile b/docker/wvp/Dockerfile
index 334c559..c6c7b0e 100644
--- a/docker/wvp/Dockerfile
+++ b/docker/wvp/Dockerfile
@@ -1,16 +1,19 @@
FROM ubuntu:20.04 AS build
+ARG gitUrl="https://gitee.com/18010473990"
+ARG zlmGitUrl="https://gitee.com/xia-chu/ZLMediaKit"
+
RUN export DEBIAN_FRONTEND=noninteractive &&\
apt-get update && \
apt-get install -y --no-install-recommends openjdk-11-jre git maven nodejs npm build-essential \
cmake ca-certificates openssl ffmpeg && \
cd /home && \
- git clone https://gitee.com/18010473990/maven.git && \
+ git clone ${gitUrl}/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 --depth=1 https://gitee.com/xia-chu/ZLMediaKit && \
+ git clone ${gitUrl}/wvp-GB28181.git && \
+ git clone ${gitUrl}/wvp-pro-assist.git && \
+ git clone --depth=1 ${zlmGitUrl} && \
mkdir -p /opt/wvp/config /opt/assist/config /opt/media/www/record && \
cd /home/wvp-GB28181/web_src && \
@@ -40,7 +43,6 @@
echo '#!/bin/bash' > run.sh && \
echo 'echo ${WVP_IP}' >> run.sh && \
echo 'echo ${WVP_CONFIG}' >> run.sh && \
- echo 'redis-server --daemonize yes --bind 0.0.0.0' >> run.sh && \
echo 'cd /opt/assist' >> run.sh && \
echo 'nohup java -jar *.jar --spring.config.location=/opt/assist/config/application.yml --userSettings.record=/opt/media/www/record/ --media.record-assist-port=18081 ${ASSIST_CONFIG} &' >> run.sh && \
echo 'nohup /opt/media/MediaServer -d -m 3 &' >> run.sh && \
@@ -63,6 +65,7 @@
EXPOSE 30000-30500/udp
RUN export DEBIAN_FRONTEND=noninteractive &&\
+ export LANG=zh_CN.UTF-8 && \
apt-get update && \
apt-get install -y --no-install-recommends openjdk-11-jre ca-certificates ffmpeg language-pack-zh-hans && \
apt-get autoremove -y && \
--
Gitblit v1.8.0