From a1398a56cc3587f08c28032a5c00f4c71b48e4f7 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期四, 02 十二月 2021 09:33:20 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 --- docker/docker-compose.yml | 4 + docker/wvp/Dockerfile | 33 +++++++++------- DOCKERFILE | 18 ++++----- src/main/resources/application-docker.yml | 16 ++++---- 4 files changed, 37 insertions(+), 34 deletions(-) diff --git a/DOCKERFILE b/DOCKERFILE index c703174..96bc29b 100644 --- a/DOCKERFILE +++ b/DOCKERFILE @@ -1,7 +1,5 @@ FROM ubuntu:20.04 AS build -# DEBIAN_FRONTEND杩欎釜鐜鍙橀噺锛屽憡鐭ユ搷浣滅郴缁熷簲璇ヤ粠鍝効鑾峰緱鐢ㄦ埛杈撳叆銆� -# 濡傛灉璁剧疆涓衡�漬oninteractive鈥濓紝浣犲氨鍙互鐩存帴杩愯鍛戒护锛岃�屾棤闇�鍚戠敤鎴疯姹傝緭鍏ワ紙鎵�鏈夋搷浣滈兘鏄潪浜や簰寮忕殑锛夈�� ARG DEBIAN_FRONTEND=noninteractive ENV TZ=Asia/Shanghai @@ -32,23 +30,23 @@ RUN git clone https://gitee.com/pan648540858/maven.git && \ cp maven/settings.xml /usr/share/maven/conf/ && \ - git clone https://gitee.com/pan648540858/wvp-GB28181-pro.git && \ + git clone https://gitee.com/pan648540858/wvp-GB28181.git && \ git clone https://gitee.com/pan648540858/wvp-pro-assist.git # 缂栬瘧鍓嶇鐣岄潰 -WORKDIR /home/wvp-GB28181-pro/web_src +WORKDIR /home/wvp-GB28181/web_src RUN npm install && \ npm run build && \ mkdir -p /opt/wvp/config && \ mkdir -p /opt/assist/config && \ - cp /home/wvp-GB28181-pro/src/main/resources/application-docker.yml /opt/wvp/config/application.yml && \ + 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 # wvp鎵撳寘 -WORKDIR /home/wvp-GB28181-pro +WORKDIR /home/wvp-GB28181 RUN mvn compile && \ mvn package && \ - cp /home/wvp-GB28181-pro/target/wvp*.jar /opt/wvp/ + cp /home/wvp-GB28181/target/wvp*.jar /opt/wvp/ # wvp 褰曞儚绠$悊鎵撳寘 WORKDIR /home/wvp-pro-assist @@ -72,7 +70,7 @@ # 娓呯悊 RUN rm -rf /home/wiki && \ - rm -rf /home/wvp-GB28181-pro && \ + rm -rf /home/wvp-GB28181 && \ apt-get autoremove -y git maven nodejs npm && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/*dic @@ -87,9 +85,9 @@ 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.config.location=/opt/wvp/config/application.yml --media.record-assist-port=18081 ${WVP_CONFIG}' >> 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 '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.hook-ip=127.0.0.1 --media.sdp-ip=${WVP_IP} --sip.ip=${WVP_IP} --media.stream-ip=${WVP_IP}' >> 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 RUN chmod +x run.sh diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 9dc6141..3da521a 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -13,7 +13,7 @@ build: context: ./wvp args: - gitUrl: "https://gitee.com/xieyu1989" + gitUrl: "https://gitee.com/pan648540858" zlmGitUrl: "https://gitee.com/xia-chu/ZLMediaKit" restart: always ports: @@ -41,6 +41,8 @@ REDIS_PORT: 6379 REDIS_DB: 6 REDIS_PWD: root + ASSIST_JVM_CONFIG: -Xms128m -Xmx256m + WVP_JVM_CONFIG: -Xms128m -Xmx256m ASSIST_CONFIG: WVP_CONFIG: depends_on: diff --git a/docker/wvp/Dockerfile b/docker/wvp/Dockerfile index 16d0c81..34e3bab 100644 --- a/docker/wvp/Dockerfile +++ b/docker/wvp/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 AS build +FROM ubuntu:20.04 as build ARG gitUrl="https://gitee.com/pan648540858" ARG zlmGitUrl="https://gitee.com/xia-chu/ZLMediaKit" @@ -6,30 +6,33 @@ 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 &&\ + mkdir -p /opt/wvp/config /opt/wvp/heapdump /opt/wvp/config /opt/assist/config /opt/assist/heapdump /opt/media/www/record RUN cd /home && \ - git clone "https://gitee.com/pan648540858/maven.git" && \ - cp maven/settings.xml /usr/share/maven/conf/ && \ - git clone "${gitUrl}/wvp-GB28181-pro.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}/maven.git" && \ + cp maven/settings.xml /usr/share/maven/conf/ -RUN cd /home/wvp-GB28181/web_src && \ +RUN cd /home && \ + git clone "${gitUrl}/wvp-GB28181-pro.git" +RUN cd /home/wvp-GB28181-pro/web_src && \ npm install && \ npm run build - -RUN cd /home/wvp-GB28181 && \ +RUN cd /home/wvp-GB28181-pro && \ mvn clean package -Dmaven.test.skip=true && \ - cp /home/wvp-GB28181/target/*.jar /opt/wvp/ && \ - cp /home/wvp-GB28181/src/main/resources/application-docker.yml /opt/wvp/config/application.yml + cp /home/wvp-GB28181-pro/target/*.jar /opt/wvp/ && \ + cp /home/wvp-GB28181-pro/src/main/resources/application-docker.yml /opt/wvp/config/application.yml +RUN cd /home && \ + git clone "${gitUrl}/wvp-pro-assist.git" RUN cd /home/wvp-pro-assist && \ + git reset --hard 58f1a79136a55a7cd1593c95b56ddadcc2225b61 && \ 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 +RUN cd /home && \ + git clone --depth=1 "${zlmGitUrl}" RUN cd /home/ZLMediaKit && \ git submodule update --init --recursive && \ mkdir -p build release/linux/Release/ &&\ @@ -44,10 +47,10 @@ echo 'echo ${WVP_IP}' >> run.sh && \ echo 'echo ${WVP_CONFIG}' >> 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 java ${ASSIST_JVM_CONFIG} -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/assist/heapdump/ -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 && \ echo 'cd /opt/wvp' >> run.sh && \ - echo 'java -jar *.jar --spring.config.location=/opt/wvp/config/application.yml --media.record-assist-port=18081 ${WVP_CONFIG}' >> run.sh && \ + echo 'java ${WVP_JVM_CONFIG} -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/wvp/heapdump/ -jar *.jar --spring.config.location=/opt/wvp/config/application.yml --media.record-assist-port=18081 ${WVP_CONFIG}' >> run.sh && \ chmod +x run.sh FROM ubuntu:20.04 diff --git a/src/main/resources/application-docker.yml b/src/main/resources/application-docker.yml index 4c9d186..37c3294 100644 --- a/src/main/resources/application-docker.yml +++ b/src/main/resources/application-docker.yml @@ -8,7 +8,7 @@ # [鍙�塢 鏁版嵁搴� DB database: ${REDIS_DB:6} # [鍙�塢 璁块棶瀵嗙爜,鑻ヤ綘鐨剅edis鏈嶅姟鍣ㄦ病鏈夎缃瘑鐮侊紝灏变笉闇�瑕佺敤瀵嗙爜鍘昏繛鎺� - password: ${REDIS_PWD:} + password: ${REDIS_PWD:root} # [鍙�塢 瓒呮椂鏃堕棿 timeout: 10000 # [鍙�塢 jdbc鏁版嵁搴撻厤缃�, 椤圭洰浣跨敤sqlite浣滀负鏁版嵁搴擄紝涓�鑸笉闇�瑕侀厤缃� @@ -36,9 +36,9 @@ # 浣滀负28181鏈嶅姟鍣ㄧ殑閰嶇疆 sip: # [蹇呴』淇敼] 鏈満鐨処P - ip: ${WVP_HOST} + ip: ${WVP_HOST:127.0.0.1} # [鍙�塢 28181鏈嶅姟鐩戝惉鐨勭鍙� - port: 5060 + port: ${WVP_PORT:5060} # 鏍规嵁鍥芥爣6.1.2涓瀹氾紝domain瀹滈噰鐢↖D缁熶竴缂栫爜鐨勫墠鍗佷綅缂栫爜銆傚浗鏍囬檮褰旸涓畾涔夊墠8浣嶄负涓績缂栫爜锛堢敱鐪佺骇銆佸競绾с�佸尯绾с�佸熀灞傜紪鍙风粍鎴愶紝鍙傜収GB/T 2260-2007锛� # 鍚庝袱浣嶄负琛屼笟缂栫爜锛屽畾涔夊弬鐓ч檮褰旸.3 # 3701020049鏍囪瘑灞变笢娴庡崡鍘嗕笅鍖� 淇℃伅琛屼笟鎺ュ叆 @@ -52,9 +52,9 @@ #zlm 榛樿鏈嶅姟鍣ㄩ厤缃� media: # [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑鍐呯綉IP - ip: 127.0.0.1 + ip: ${ZLM_HOST:127.0.0.1} # [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑http.port - http-port: 80 + http-port: ${ZLM_PORT:80} # [鍙�塢 zlm鏈嶅姟鍣ㄧ殑hook.admin_params=secret secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc # 鍚敤澶氱鍙fā寮�, 澶氱鍙fā寮忎娇鐢ㄧ鍙e尯鍒嗘瘡璺祦锛屽吋瀹规�ф洿濂姐�� 鍗曠鍙d娇鐢ㄦ祦鐨剆src鍖哄垎锛� 鐐规挱瓒呮椂寤鸿浣跨敤澶氱鍙f祴璇� @@ -67,8 +67,8 @@ send-port-range: 30000,30500 # 绔彛鑼冨洿 # 褰曞儚杈呭姪鏈嶅姟锛� 閮ㄧ讲姝ゆ湇鍔″彲浠ュ疄鐜皕lm褰曞儚鐨勭鐞嗕笌涓嬭浇锛� 0 琛ㄧず涓嶄娇鐢� record-assist-port: 18081 - sdp-ip: ${WVP_HOST} - stream-ip: ${WVP_HOST} + sdp-ip: ${sip.ip} + stream-ip: ${sip.ip} # [鍙�塢 鏃ュ織閰嶇疆, 涓�鑸笉闇�瑕佹敼 logging: file: @@ -85,7 +85,7 @@ user-settings: # 鎺ㄦ祦鐩存挱鏄惁褰曞埗 record-push-live: true - auto-apply-play: false + auto-apply-play: true # 鍦ㄧ嚎鏂囨。锛� swagger-ui锛堢敓浜х幆澧冨缓璁叧闂級 swagger-ui: -- Gitblit v1.8.0