diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index dcc2730..910e7d2 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -2,10 +2,10 @@ version: '3' services: polaris-wvp: - # 显式指定构建上下文和Dockerfile路径 + # 构建上下文改为 wvp 目录，需要先把 jar 包放到该目录 build: - context: .. # 构建上下文的根路径 - dockerfile: ./docker/wvp/Dockerfile # 相对于上下文路径的Dockerfile位置 + context: ./wvp # jar 包所在目录 + dockerfile: ../wvp/Dockerfile restart: always networks: - media-net diff --git a/docker/wvp/Dockerfile b/docker/wvp/Dockerfile index e66b4cd..236a90a 100644 --- a/docker/wvp/Dockerfile +++ b/docker/wvp/Dockerfile @@ -1,84 +1,17 @@ -FROM ringcentral/jdk:11 AS builder +FROM docker.xuanyuan.me/library/ubuntu:latest +FROM swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/openjdk:11 EXPOSE 18978/tcp EXPOSE 8116/tcp EXPOSE 8116/udp -EXPOSE 8080/tcp -#RUN apt-get update && \ - #DEBIAN_FRONTEND="noninteractive" \ - #apt-get install -y --no-install-recommends \ - #wget \ - #cmake \ - #maven \ - #git \ - #ca-certificates \ - #tzdata \ - #curl \ - #libpcre3 \ - #libpcre3-dev \ - #zlib1g-dev \ - #openssl \ - #libssl-dev \ - #gdb && \ - #apt-get autoremove -y && \ - #apt-get clean -y && \ - #rm -rf /var/lib/apt/lists/* +ENV TZ=Asia/Shanghai -## install jdk1.8 -#RUN mkdir -p /opt/download -#WORKDIR /opt/download -#RUN if [ "$Platfrom" = "arm64" ]; \ - #then \ - #wget https://polaris-tian-generic.pkg.coding.net/qt/autopliot/jdk-8u411-linux-aarch64.tar.gz?version=latest --no-check-certificate -O jdk-8.tar.gz && \ - #tar -zxvf /opt/download/jdk-8.tar.gz -C /usr/local/ --transform 's/jdk1.8.0_411/java/' && \ - #rm /opt/download/jdk-8.tar.gz; \ - #else \ - #wget https://polaris-tian-generic.pkg.coding.net/qt/autopliot/jdk-8u202-linux-x64.tar.gz?version=latest --no-check-certificate -O jdk-8.tar.gz && \ - #tar -zxvf /opt/download/jdk-8.tar.gz -C /usr/local/ --transform 's/jdk1.8.0_202/java/' && \ - #rm /opt/download/jdk-8.tar.gz; \ - #fi - -#ENV JAVA_HOME /usr/local/java/ -#ENV JRE_HOME ${JAVA_HOME}/jre -#ENV CLASSPATH .:${JAVA_HOME}/lib:${JRE_HOME}/lib -#ENV PATH ${JAVA_HOME}/bin:$PATH - -RUN java -version && javac -version - -#RUN sed -i 's/deb.debian.org/mirrors.aliyun.com/g' /etc/apt/sources.list.d/debian.sources && \ -RUN apt-get update && \ - apt-get install -y maven && \ - rm -rf /var/lib/apt/lists/* - - -COPY . /build -WORKDIR /build -RUN ls && mvn clean package -Dmaven.test.skip=true -WORKDIR /build/target -RUN mv wvp-pro-*.jar wvp.jar - - -FROM ringcentral/jdk:11 -RUN mkdir -p /opt/wvp +RUN mkdir -p /opt/wvp /opt/ylcx/wvp WORKDIR /opt/wvp -COPY --from=builder /build/target /opt/wvp -COPY ./docker/wvp/wvp /opt/wvp -ENTRYPOINT ["java", "-Xms512m", "-Xmx1024m", "-XX:+HeapDumpOnOutOfMemoryError", "-XX:HeapDumpPath=/opt/ylcx/", "-jar", "wvp.jar", "--spring.config.location=/opt/ylcx/wvp/application.yml"] +# 复制本地已打包好的 jar 文件 +COPY wvp.jar /opt/wvp/wvp.jar +COPY wvp/ /opt/wvp/ - -#RUN mkdir -p /opt/wvp -#WORKDIR /opt/wvp -#COPY ./wvp /opt/wvp -# -#WORKDIR /home -#RUN cd /home && \ - #git clone https://gitee.com/pan648540858/wvp-GB28181-pro.git -# -#RUN cd /home/wvp-GB28181-pro && \ - #mvn clean package -Dmaven.test.skip=true && \ - #cp /home/wvp-GB28181-pro/target/*.jar /opt/wvp/wvp.jar -# -#WORKDIR /opt/wvp -#ENTRYPOINT ["java", "-Xms512m", "-Xmx1024m", "-XX:+HeapDumpOnOutOfMemoryError", "-XX:HeapDumpPath=/opt/ylcx/", "-jar", "wvp.jar", "--spring.config.location=/opt/ylcx/wvp/application.yml"] \ No newline at end of file +ENTRYPOINT ["java", "-Xms512m", "-Xmx1024m", "-XX:+HeapDumpOnOutOfMemoryError", "-XX:HeapDumpPath=/opt/ylcx/", "-jar", "wvp.jar", "--spring.config.location=/opt/ylcx/wvp/application.yml"] \ No newline at end of file diff --git a/docker/wvp/wvp/application-docker.yml b/docker/wvp/wvp/application-docker.yml index 04eeff8..98cae79 100644 --- a/docker/wvp/wvp/application-docker.yml +++ b/docker/wvp/wvp/application-docker.yml @@ -86,7 +86,7 @@ media: # [可选] 返回流地址时的ip，置空使用 media.ip stream-ip: ${Stream_IP} # [可选] wvp在国标信令中使用的ip，此ip为摄像机可以访问到的ip， 置空使用 media.ip - sdp-ip: ${SDP_IP} +# sdp-ip: ${SDP_IP} # [可选] zlm服务器访问WVP所使用的IP, 默认使用127.0.0.1，zlm和wvp没有部署在同一台服务器时必须配置 hook-ip: ${ZLM_HOOK_HOST} # [可选] sslport diff --git a/snap/34020000001320000002_34020000001320000002.jpg b/snap/34020000001320000002_34020000001320000002.jpg index 6b06f39..7b5844c 100644 Binary files a/snap/34020000001320000002_34020000001320000002.jpg and b/snap/34020000001320000002_34020000001320000002.jpg differ diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index c9189aa..c696542 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -15,22 +15,22 @@ spring: # REDIS数据库配置 redis: # [必须修改] Redis服务器IP, REDIS安装在本机的,使用127.0.0.1 - host: 192.168.0.66 + host: 192.168.0.98 # [必须修改] 端口号 port: 6379 # [可选] 数据库 DB database: 7 # [可选] 访问密码,若你的redis服务器没有设置密码，就不需要用密码去连接 - password: root + password: hxYD@2025 # [可选] 超时时间 timeout: 10000 # mysql数据源 datasource: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://192.168.0.66:3306/wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true + url: jdbc:mysql://192.168.0.98:3306/wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true username: root - password: 123456 + password: hxYD@2025 #[可选] WVP监听的HTTP端口, 网页和接口调用都是这个端口 server: port: 18080 @@ -67,7 +67,7 @@ media: id: zlmediakit-local # [必须修改] zlm服务器的内网IP # ip: 192.168.0.48 - ip: 192.168.0.66 + ip: 192.168.0.98 # [必须修改] zlm服务器的http.port http-port: 85 # [必选选] zlm服务器的hook.admin_params=secret diff --git a/src/main/resources/application-docker.yml b/src/main/resources/application-docker.yml index d7de97f..41bc432 100644 --- a/src/main/resources/application-docker.yml +++ b/src/main/resources/application-docker.yml @@ -9,7 +9,7 @@ spring: # REDIS数据库配置 redis: # [必须修改] Redis服务器IP, REDIS安装在本机的,使用127.0.0.1 - host: ${REDIS_HOST:127.0.0.1} + host: ${REDIS_HOST:172.18.0.1} # [必须修改] 端口号 port: ${REDIS_PORT:6379} # [可选] 数据库 DB