Commit 792008ab4ee250b971f70cdfe1f4359eedeaa0d3
1 parent
d8c3638a
尝试docker-compose启动
Showing
1 changed file
with
18 additions
and
17 deletions
docker/wvp/Dockerfile
| ... | ... | @@ -6,40 +6,40 @@ ARG zlmGitUrl="https://gitee.com/xia-chu/ZLMediaKit" |
| 6 | 6 | RUN export DEBIAN_FRONTEND=noninteractive &&\ |
| 7 | 7 | apt-get update && \ |
| 8 | 8 | apt-get install -y --no-install-recommends openjdk-11-jre git maven nodejs npm build-essential \ |
| 9 | - cmake ca-certificates openssl ffmpeg && \ | |
| 9 | + cmake ca-certificates openssl ffmpeg | |
| 10 | 10 | |
| 11 | - cd /home && \ | |
| 12 | - git clone ${gitUrl}/maven.git && \ | |
| 11 | +RUN cd /home && \ | |
| 12 | + git clone "https://gitee.com/18010473990/maven.git" && \ | |
| 13 | 13 | cp maven/settings.xml /usr/share/maven/conf/ && \ |
| 14 | - git clone ${gitUrl}/wvp-GB28181.git && \ | |
| 15 | - git clone ${gitUrl}/wvp-pro-assist.git && \ | |
| 16 | - git clone --depth=1 ${zlmGitUrl} && \ | |
| 17 | - mkdir -p /opt/wvp/config /opt/assist/config /opt/media/www/record && \ | |
| 14 | + git clone "${gitUrl}/wvp-GB28181.git" && \ | |
| 15 | + git clone "${gitUrl}/wvp-pro-assist.git" && \ | |
| 16 | + git clone --depth=1 "${zlmGitUrl}" && \ | |
| 17 | + mkdir -p /opt/wvp/config /opt/assist/config /opt/media/www/record | |
| 18 | 18 | |
| 19 | - cd /home/wvp-GB28181/web_src && \ | |
| 19 | +RUN cd /home/wvp-GB28181/web_src && \ | |
| 20 | 20 | npm install && \ |
| 21 | - npm run build && \ | |
| 21 | + npm run build | |
| 22 | 22 | |
| 23 | - cd /home/wvp-GB28181 && \ | |
| 23 | +RUN cd /home/wvp-GB28181 && \ | |
| 24 | 24 | mvn clean package -Dmaven.test.skip=true && \ |
| 25 | 25 | cp /home/wvp-GB28181/target/*.jar /opt/wvp/ && \ |
| 26 | - cp /home/wvp-GB28181/src/main/resources/application-dev.yml /opt/wvp/config/application.yml && \ | |
| 26 | + cp /home/wvp-GB28181/src/main/resources/application-dev.yml /opt/wvp/config/application.yml | |
| 27 | 27 | |
| 28 | - cd /home/wvp-pro-assist && \ | |
| 28 | +RUN cd /home/wvp-pro-assist && \ | |
| 29 | 29 | mvn clean package -Dmaven.test.skip=true && \ |
| 30 | 30 | cp /home/wvp-pro-assist/target/*.jar /opt/assist/ && \ |
| 31 | - cp /home/wvp-pro-assist/src/main/resources/application-dev.yml /opt/assist/config/application.yml && \ | |
| 31 | + cp /home/wvp-pro-assist/src/main/resources/application-dev.yml /opt/assist/config/application.yml | |
| 32 | 32 | |
| 33 | - cd /home/ZLMediaKit && \ | |
| 33 | +RUN cd /home/ZLMediaKit && \ | |
| 34 | 34 | git submodule update --init --recursive && \ |
| 35 | 35 | mkdir -p build release/linux/Release/ &&\ |
| 36 | 36 | cd build && \ |
| 37 | 37 | cmake -DCMAKE_BUILD_TYPE=Release .. && \ |
| 38 | 38 | make -j4 && \ |
| 39 | 39 | rm -rf ../release/linux/Release/config.ini && \ |
| 40 | - cp -r ../release/linux/Release/* /opt/media && \ | |
| 40 | + cp -r ../release/linux/Release/* /opt/media | |
| 41 | 41 | |
| 42 | - cd /opt/wvp && \ | |
| 42 | +RUN cd /opt/wvp && \ | |
| 43 | 43 | echo '#!/bin/bash' > run.sh && \ |
| 44 | 44 | echo 'echo ${WVP_IP}' >> run.sh && \ |
| 45 | 45 | echo 'echo ${WVP_CONFIG}' >> run.sh && \ |
| ... | ... | @@ -64,8 +64,9 @@ EXPOSE 554/udp |
| 64 | 64 | EXPOSE 30000-30500/tcp |
| 65 | 65 | EXPOSE 30000-30500/udp |
| 66 | 66 | |
| 67 | +ENV LC_ALL zh_CN.UTF-8 | |
| 68 | + | |
| 67 | 69 | RUN export DEBIAN_FRONTEND=noninteractive &&\ |
| 68 | - export LANG=zh_CN.UTF-8 && \ | |
| 69 | 70 | apt-get update && \ |
| 70 | 71 | apt-get install -y --no-install-recommends openjdk-11-jre ca-certificates ffmpeg language-pack-zh-hans && \ |
| 71 | 72 | apt-get autoremove -y && \ | ... | ... |