Merge branch 'wvp-28181-2.0' into wvp-pro-record

648540858

2022-02-24 00afecac47094b746ce04146ea483010baf225cc

 DOCKERFILE

@@ -28,10 +28,10 @@
         cmake curl  vim ca-certificates  tzdata libmysqlclient-dev  redis-server libssl-dev libx264-dev libfaac-dev ffmpeg
WORKDIR /home

RUN      git clone https://gitee.com/18010473990/maven.git && \
RUN      git clone https://gitee.com/pan648540858/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 https://gitee.com/pan648540858/wvp-GB28181.git && \
         git clone https://gitee.com/pan648540858/wvp-pro-assist.git
         # 编译前端界面
WORKDIR /home/wvp-GB28181/web_src

@@ -41,11 +41,6 @@
         mkdir -p /opt/assist/config && \
         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

RUN      npm install && \
         npm run build && \
         mkdir -p /opt/wvp/config && \
         cp /home/wvp-GB28181/src/main/resources/application-dev.yml /opt/wvp/config/application.yml

         # wvp打包
WORKDIR /home/wvp-GB28181
@@ -68,6 +63,7 @@
        cd build && \
        cmake -DCMAKE_BUILD_TYPE=Release .. && \
        make -j4 && \
        rm -rf ../release/linux/Release/config.ini && \
        cp -r ../release/linux/Release/* /opt/media && \
        mkdir -p /opt/media/www/record

@@ -89,7 +85,7 @@
        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.sdp-ip=${WVP_IP} --sip.ip=${WVP_IP} --media.stream-ip=${WVP_IP}' >> run.sh  && \
        echo 'fi' >> run.sh
@@ -128,4 +124,4 @@

WORKDIR /opt/wvp
COPY --from=build /opt /opt
CMD ["sh", "run.sh"]
CMD ["sh", "run.sh"]