Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

648540858

2021-10-15 a371015be7c75357f6ce667918f2ec889ffb4c06

Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

 DOCKERFILE

@@ -42,11 +42,6 @@
         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
RUN      mvn compile && \
@@ -129,4 +124,4 @@

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