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启动
---
docker/wvp/Dockerfile | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/docker/wvp/Dockerfile b/docker/wvp/Dockerfile
index 1386989..6728e4a 100644
--- a/docker/wvp/Dockerfile
+++ b/docker/wvp/Dockerfile
@@ -6,44 +6,43 @@
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 && \
+ cmake ca-certificates openssl ffmpeg
- cd /home && \
- git clone ${gitUrl}/maven.git && \
+RUN cd /home && \
+ git clone "https://gitee.com/18010473990/maven.git" && \
cp maven/settings.xml /usr/share/maven/conf/ && \
- 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 && \
+ 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 && \
+RUN cd /home/wvp-GB28181/web_src && \
npm install && \
- npm run build && \
+ npm run build
- cd /home/wvp-GB28181 && \
+RUN cd /home/wvp-GB28181 && \
mvn clean package -Dmaven.test.skip=true && \
cp /home/wvp-GB28181/target/*.jar /opt/wvp/ && \
- cp /home/wvp-GB28181/src/main/resources/application-dev.yml /opt/wvp/config/application.yml && \
+ cp /home/wvp-GB28181/src/main/resources/application-dev.yml /opt/wvp/config/application.yml
- cd /home/wvp-pro-assist && \
+RUN cd /home/wvp-pro-assist && \
mvn clean package -Dmaven.test.skip=true && \
cp /home/wvp-pro-assist/target/*.jar /opt/assist/ && \
- cp /home/wvp-pro-assist/src/main/resources/application-dev.yml /opt/assist/config/application.yml && \
+ cp /home/wvp-pro-assist/src/main/resources/application-dev.yml /opt/assist/config/application.yml
- cd /home/ZLMediaKit && \
+RUN cd /home/ZLMediaKit && \
git submodule update --init --recursive && \
mkdir -p build release/linux/Release/ &&\
cd build && \
cmake -DCMAKE_BUILD_TYPE=Release .. && \
make -j4 && \
rm -rf ../release/linux/Release/config.ini && \
- cp -r ../release/linux/Release/* /opt/media && \
+ cp -r ../release/linux/Release/* /opt/media
- cd /opt/wvp && \
+RUN cd /opt/wvp && \
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 && \
@@ -65,8 +64,9 @@
EXPOSE 30000-30500/tcp
EXPOSE 30000-30500/udp
+ENV LC_ALL zh_CN.UTF-8
+
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