Browse Source

chore: 厂商Linux64 SDK由vendor-sdk迁移至lib目录

- 41个SDK运行库原样移动,git识别为重命名,仓库体积不变
- 移除迁移后遗留的lib.rar压缩包
- 同步Dockerfile构建参数、.dockerignore/.gitignore白名单及部署文档
master
王寅 1 month ago
parent
commit
52328c3568
46 changed files with 9 additions and 15 deletions
  1. +5
    -6
      .dockerignore
  2. +0
    -5
      .gitignore
  3. +3
    -3
      Dockerfile
  4. +1
    -1
      docs/docker-deployment.md
  5. BIN
      lib.rar
  6. +0
    -0
      lib/dahua-linux64/libImageAlg.so
  7. +0
    -0
      lib/dahua-linux64/libRenderEngine.so
  8. +0
    -0
      lib/dahua-linux64/libStreamConvertor.so
  9. +0
    -0
      lib/dahua-linux64/libavnetsdk.so
  10. +0
    -0
      lib/dahua-linux64/libcrypto.so
  11. +0
    -0
      lib/dahua-linux64/libdhconfigsdk.so
  12. +0
    -0
      lib/dahua-linux64/libdhnetsdk.so
  13. +0
    -0
      lib/dahua-linux64/libplay.so
  14. +0
    -0
      lib/dahua-linux64/libssl.so
  15. +0
    -0
      lib/hik-linux64/HCNetSDKCom/libAudioIntercom.so
  16. +0
    -0
      lib/hik-linux64/HCNetSDKCom/libAudioProcess.so
  17. +0
    -0
      lib/hik-linux64/HCNetSDKCom/libAudioRender.so
  18. +0
    -0
      lib/hik-linux64/HCNetSDKCom/libHCAlarm.so
  19. +0
    -0
      lib/hik-linux64/HCNetSDKCom/libHCCoreDevCfg.so
  20. +0
    -0
      lib/hik-linux64/HCNetSDKCom/libHCDisplay.so
  21. +0
    -0
      lib/hik-linux64/HCNetSDKCom/libHCGeneralCfgMgr.so
  22. +0
    -0
      lib/hik-linux64/HCNetSDKCom/libHCIndustry.so
  23. +0
    -0
      lib/hik-linux64/HCNetSDKCom/libHCPlayBack.so
  24. +0
    -0
      lib/hik-linux64/HCNetSDKCom/libHCPreview.so
  25. +0
    -0
      lib/hik-linux64/HCNetSDKCom/libHCVoiceTalk.so
  26. +0
    -0
      lib/hik-linux64/HCNetSDKCom/libStreamTransClient.so
  27. +0
    -0
      lib/hik-linux64/HCNetSDKCom/libSuperRender.so
  28. +0
    -0
      lib/hik-linux64/HCNetSDKCom/libSystemTransform.so
  29. +0
    -0
      lib/hik-linux64/HCNetSDKCom/libanalyzedata.so
  30. +0
    -0
      lib/hik-linux64/HCNetSDKCom/libiconv.so.2
  31. +0
    -0
      lib/hik-linux64/HCNetSDKCom/libopenal.so
  32. +0
    -0
      lib/hik-linux64/HCNetSDK_Log_Switch.xml
  33. +0
    -0
      lib/hik-linux64/libAudioProcess.so
  34. +0
    -0
      lib/hik-linux64/libAudioRender.so
  35. +0
    -0
      lib/hik-linux64/libColorSpace.so
  36. +0
    -0
      lib/hik-linux64/libHCCore.so
  37. +0
    -0
      lib/hik-linux64/libHXVA.so
  38. +0
    -0
      lib/hik-linux64/libNPQos.so
  39. +0
    -0
      lib/hik-linux64/libPlayCtrl.so
  40. +0
    -0
      lib/hik-linux64/libSuperRender.so
  41. +0
    -0
      lib/hik-linux64/libcrypto.so.3
  42. +0
    -0
      lib/hik-linux64/libhcnetsdk.so
  43. +0
    -0
      lib/hik-linux64/libhpr.so
  44. +0
    -0
      lib/hik-linux64/libopenal.so.1
  45. +0
    -0
      lib/hik-linux64/libssl.so.3
  46. +0
    -0
      lib/hik-linux64/libz.so

+ 5
- 6
.dockerignore View File

@ -20,9 +20,8 @@
!lib/LocalSensorAdd.dat
!lib/license.dat
# 仅发送两套 Linux x86_64 SDK 的运行库,开发示例和文档不进入构建上下文。
!vendor-sdk/
!vendor-sdk/hik-linux64/
!vendor-sdk/hik-linux64/**
!vendor-sdk/dahua-linux64/
!vendor-sdk/dahua-linux64/**
# 仅发送 lib 下两套 Linux x86_64 SDK 的运行库,其他开发示例和文档不进入构建上下文。
!lib/hik-linux64/
!lib/hik-linux64/**
!lib/dahua-linux64/
!lib/dahua-linux64/**

+ 0
- 5
.gitignore View File

@ -37,11 +37,6 @@ build/
# 本地设计过程文档不纳入版本库
/docs/superpowers/
# vendor-sdk 仅保留 Docker 运行时实际复制的 Linux64 动态库
/vendor-sdk/*
!/vendor-sdk/dahua-linux64/
!/vendor-sdk/hik-linux64/
# 本机部署与离线交付产物
/deploy/
/deploy-package/


+ 3
- 3
Dockerfile View File

@ -56,13 +56,13 @@ FROM --platform=$TARGETPLATFORM ${FFMPEG_IMAGE} AS ffmpeg
FROM eclipse-temurin:8-jre-focal AS runtime
ARG TARGETARCH
ARG HIK_SDK_ROOT=vendor-sdk/hik-linux64
ARG DAHUA_SDK_ROOT=vendor-sdk/dahua-linux64
ARG HIK_SDK_ROOT=lib/hik-linux64
ARG DAHUA_SDK_ROOT=lib/dahua-linux64
ARG UBUNTU_MIRROR=https://mirrors.aliyun.com/ubuntu
# 两套厂商库均为 x86_64,构建时阻止误选其他平台导致 JNA 加载失败。
RUN test "${TARGETARCH}" = "amd64" \
|| (echo "inspect-nvr 当前 Docker 镜像只支持 linux/amd64:vendor-sdk 中的海康和大华 SDK 均为 x86_64。" >&2; exit 1)
|| (echo "inspect-nvr 当前 Docker 镜像只支持 linux/amd64:lib 中的海康和大华 SDK 均为 x86_64。" >&2; exit 1)
ENV DEBIAN_FRONTEND=noninteractive \
TZ=Asia/Shanghai


+ 1
- 1
docs/docker-deployment.md View File

@ -66,7 +66,7 @@ ORDER BY nvr_id;
## 4. CPU 架构限制
Compose 将应用固定为 `linux/amd64`,并从 `vendor-sdk` 复制海康 HCNetSDK Linux64 与大华 NetSDK Linux64:
Compose 将应用固定为 `linux/amd64`,并从 `lib/hik-linux64` 和 `lib/dahua-linux64` 复制海康 HCNetSDK Linux64 与大华 NetSDK Linux64:
- x86_64 Ubuntu/Linux 服务器可原生构建和运行,不需要安装 QEMU。
- x86_64 Windows/macOS 的 Docker Desktop 可直接运行 Linux amd64 容器。


BIN
lib.rar View File


vendor-sdk/dahua-linux64/libImageAlg.so → lib/dahua-linux64/libImageAlg.so View File


vendor-sdk/dahua-linux64/libRenderEngine.so → lib/dahua-linux64/libRenderEngine.so View File


vendor-sdk/dahua-linux64/libStreamConvertor.so → lib/dahua-linux64/libStreamConvertor.so View File


vendor-sdk/dahua-linux64/libavnetsdk.so → lib/dahua-linux64/libavnetsdk.so View File


vendor-sdk/dahua-linux64/libcrypto.so → lib/dahua-linux64/libcrypto.so View File


vendor-sdk/dahua-linux64/libdhconfigsdk.so → lib/dahua-linux64/libdhconfigsdk.so View File


vendor-sdk/dahua-linux64/libdhnetsdk.so → lib/dahua-linux64/libdhnetsdk.so View File


vendor-sdk/dahua-linux64/libplay.so → lib/dahua-linux64/libplay.so View File


vendor-sdk/dahua-linux64/libssl.so → lib/dahua-linux64/libssl.so View File


vendor-sdk/hik-linux64/HCNetSDKCom/libAudioIntercom.so → lib/hik-linux64/HCNetSDKCom/libAudioIntercom.so View File


vendor-sdk/hik-linux64/HCNetSDKCom/libAudioProcess.so → lib/hik-linux64/HCNetSDKCom/libAudioProcess.so View File


vendor-sdk/hik-linux64/HCNetSDKCom/libAudioRender.so → lib/hik-linux64/HCNetSDKCom/libAudioRender.so View File


vendor-sdk/hik-linux64/HCNetSDKCom/libHCAlarm.so → lib/hik-linux64/HCNetSDKCom/libHCAlarm.so View File


vendor-sdk/hik-linux64/HCNetSDKCom/libHCCoreDevCfg.so → lib/hik-linux64/HCNetSDKCom/libHCCoreDevCfg.so View File


vendor-sdk/hik-linux64/HCNetSDKCom/libHCDisplay.so → lib/hik-linux64/HCNetSDKCom/libHCDisplay.so View File


vendor-sdk/hik-linux64/HCNetSDKCom/libHCGeneralCfgMgr.so → lib/hik-linux64/HCNetSDKCom/libHCGeneralCfgMgr.so View File


vendor-sdk/hik-linux64/HCNetSDKCom/libHCIndustry.so → lib/hik-linux64/HCNetSDKCom/libHCIndustry.so View File


vendor-sdk/hik-linux64/HCNetSDKCom/libHCPlayBack.so → lib/hik-linux64/HCNetSDKCom/libHCPlayBack.so View File


vendor-sdk/hik-linux64/HCNetSDKCom/libHCPreview.so → lib/hik-linux64/HCNetSDKCom/libHCPreview.so View File


vendor-sdk/hik-linux64/HCNetSDKCom/libHCVoiceTalk.so → lib/hik-linux64/HCNetSDKCom/libHCVoiceTalk.so View File


vendor-sdk/hik-linux64/HCNetSDKCom/libStreamTransClient.so → lib/hik-linux64/HCNetSDKCom/libStreamTransClient.so View File


vendor-sdk/hik-linux64/HCNetSDKCom/libSuperRender.so → lib/hik-linux64/HCNetSDKCom/libSuperRender.so View File


vendor-sdk/hik-linux64/HCNetSDKCom/libSystemTransform.so → lib/hik-linux64/HCNetSDKCom/libSystemTransform.so View File


vendor-sdk/hik-linux64/HCNetSDKCom/libanalyzedata.so → lib/hik-linux64/HCNetSDKCom/libanalyzedata.so View File


vendor-sdk/hik-linux64/HCNetSDKCom/libiconv.so.2 → lib/hik-linux64/HCNetSDKCom/libiconv.so.2 View File


vendor-sdk/hik-linux64/HCNetSDKCom/libopenal.so → lib/hik-linux64/HCNetSDKCom/libopenal.so View File


vendor-sdk/hik-linux64/HCNetSDK_Log_Switch.xml → lib/hik-linux64/HCNetSDK_Log_Switch.xml View File


vendor-sdk/hik-linux64/libAudioProcess.so → lib/hik-linux64/libAudioProcess.so View File


vendor-sdk/hik-linux64/libAudioRender.so → lib/hik-linux64/libAudioRender.so View File


vendor-sdk/hik-linux64/libColorSpace.so → lib/hik-linux64/libColorSpace.so View File


vendor-sdk/hik-linux64/libHCCore.so → lib/hik-linux64/libHCCore.so View File


vendor-sdk/hik-linux64/libHXVA.so → lib/hik-linux64/libHXVA.so View File


vendor-sdk/hik-linux64/libNPQos.so → lib/hik-linux64/libNPQos.so View File


vendor-sdk/hik-linux64/libPlayCtrl.so → lib/hik-linux64/libPlayCtrl.so View File


vendor-sdk/hik-linux64/libSuperRender.so → lib/hik-linux64/libSuperRender.so View File


vendor-sdk/hik-linux64/libcrypto.so.3 → lib/hik-linux64/libcrypto.so.3 View File


vendor-sdk/hik-linux64/libhcnetsdk.so → lib/hik-linux64/libhcnetsdk.so View File


vendor-sdk/hik-linux64/libhpr.so → lib/hik-linux64/libhpr.so View File


vendor-sdk/hik-linux64/libopenal.so.1 → lib/hik-linux64/libopenal.so.1 View File


vendor-sdk/hik-linux64/libssl.so.3 → lib/hik-linux64/libssl.so.3 View File


vendor-sdk/hik-linux64/libz.so → lib/hik-linux64/libz.so View File


Loading…
Cancel
Save