From b39617d998eaa75090f7f2516b46d6b671e02210 Mon Sep 17 00:00:00 2001 From: jiumikeji <929832497@qq.com> Date: Tue, 22 Apr 2025 20:25:42 +0800 Subject: [PATCH] jiumi --- docker/docker-compose.yml | 4 ++-- docker/wvp/Dockerfile | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 3da521a..7d65a34 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -13,7 +13,7 @@ services: build: context: ./wvp args: - gitUrl: "https://gitee.com/pan648540858" + gitUrl: "https://git.a.hebei9.cn/gitjiumi" zlmGitUrl: "https://gitee.com/xia-chu/ZLMediaKit" restart: always ports: @@ -33,7 +33,7 @@ services: environment: TZ: "Asia/Shanghai" # [必须修改] 本机的IP - WVP_HOST: 172.18.0.61 + WVP_HOST: 192.168.2.28 WVP_PWD: aseqw_+hiy123 WVP_DOMAIN: 6101130049 WVP_ID: 61011300490000000001 diff --git a/docker/wvp/Dockerfile b/docker/wvp/Dockerfile index 260b8ea..13df65e 100644 --- a/docker/wvp/Dockerfile +++ b/docker/wvp/Dockerfile @@ -15,21 +15,21 @@ RUN cd /home && \ RUN cd /home && \ git clone "${gitUrl}/gb28181.git" -RUN cd /home/wvp-GB28181-pro/web_src && \ +RUN cd /home/gb28181/web_src && \ npm install && \ npm run build -RUN cd /home/wvp-GB28181-pro && \ +RUN cd /home/gb28181 && \ mvn clean package -Dmaven.test.skip=true && \ - 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 + cp /home/gb28181/target/*.jar /opt/wvp/ && \ + cp /home/gb28181/src/main/resources/application-docker.yml /opt/wvp/config/application.yml RUN cd /home && \ git clone "${gitUrl}/gb28181-assist.git" -RUN cd /home/wvp-pro-assist && \ +RUN cd /home/gb28181-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 + cp /home/gb28181-assist/target/*.jar /opt/assist/ && \ + cp /home/gb28181-assist/src/main/resources/application-dev.yml /opt/assist/config/application.yml RUN cd /home && \ git clone --depth=1 "${zlmGitUrl}"