diff --git a/.dockerignore b/.dockerignore index 004cb270..fd0b5677 100644 --- a/.dockerignore +++ b/.dockerignore @@ -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/** diff --git a/.gitignore b/.gitignore index 5a8cbbce..4e732d97 100644 --- a/.gitignore +++ b/.gitignore @@ -37,11 +37,6 @@ build/ # 本地设计过程文档不纳入版本库 /docs/superpowers/ -# vendor-sdk 仅保留 Docker 运行时实际复制的 Linux64 动态库 -/vendor-sdk/* -!/vendor-sdk/dahua-linux64/ -!/vendor-sdk/hik-linux64/ - # 本机部署与离线交付产物 /deploy/ /deploy-package/ diff --git a/Dockerfile b/Dockerfile index d26d3ac8..5ca4aa2e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/docs/docker-deployment.md b/docs/docker-deployment.md index 1ac731c8..fce5cc71 100644 --- a/docs/docker-deployment.md +++ b/docs/docker-deployment.md @@ -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 容器。 diff --git a/lib.rar b/lib.rar deleted file mode 100644 index 84786095..00000000 Binary files a/lib.rar and /dev/null differ diff --git a/vendor-sdk/dahua-linux64/libImageAlg.so b/lib/dahua-linux64/libImageAlg.so similarity index 100% rename from vendor-sdk/dahua-linux64/libImageAlg.so rename to lib/dahua-linux64/libImageAlg.so diff --git a/vendor-sdk/dahua-linux64/libRenderEngine.so b/lib/dahua-linux64/libRenderEngine.so similarity index 100% rename from vendor-sdk/dahua-linux64/libRenderEngine.so rename to lib/dahua-linux64/libRenderEngine.so diff --git a/vendor-sdk/dahua-linux64/libStreamConvertor.so b/lib/dahua-linux64/libStreamConvertor.so similarity index 100% rename from vendor-sdk/dahua-linux64/libStreamConvertor.so rename to lib/dahua-linux64/libStreamConvertor.so diff --git a/vendor-sdk/dahua-linux64/libavnetsdk.so b/lib/dahua-linux64/libavnetsdk.so similarity index 100% rename from vendor-sdk/dahua-linux64/libavnetsdk.so rename to lib/dahua-linux64/libavnetsdk.so diff --git a/vendor-sdk/dahua-linux64/libcrypto.so b/lib/dahua-linux64/libcrypto.so similarity index 100% rename from vendor-sdk/dahua-linux64/libcrypto.so rename to lib/dahua-linux64/libcrypto.so diff --git a/vendor-sdk/dahua-linux64/libdhconfigsdk.so b/lib/dahua-linux64/libdhconfigsdk.so similarity index 100% rename from vendor-sdk/dahua-linux64/libdhconfigsdk.so rename to lib/dahua-linux64/libdhconfigsdk.so diff --git a/vendor-sdk/dahua-linux64/libdhnetsdk.so b/lib/dahua-linux64/libdhnetsdk.so similarity index 100% rename from vendor-sdk/dahua-linux64/libdhnetsdk.so rename to lib/dahua-linux64/libdhnetsdk.so diff --git a/vendor-sdk/dahua-linux64/libplay.so b/lib/dahua-linux64/libplay.so similarity index 100% rename from vendor-sdk/dahua-linux64/libplay.so rename to lib/dahua-linux64/libplay.so diff --git a/vendor-sdk/dahua-linux64/libssl.so b/lib/dahua-linux64/libssl.so similarity index 100% rename from vendor-sdk/dahua-linux64/libssl.so rename to lib/dahua-linux64/libssl.so diff --git a/vendor-sdk/hik-linux64/HCNetSDKCom/libAudioIntercom.so b/lib/hik-linux64/HCNetSDKCom/libAudioIntercom.so similarity index 100% rename from vendor-sdk/hik-linux64/HCNetSDKCom/libAudioIntercom.so rename to lib/hik-linux64/HCNetSDKCom/libAudioIntercom.so diff --git a/vendor-sdk/hik-linux64/HCNetSDKCom/libAudioProcess.so b/lib/hik-linux64/HCNetSDKCom/libAudioProcess.so similarity index 100% rename from vendor-sdk/hik-linux64/HCNetSDKCom/libAudioProcess.so rename to lib/hik-linux64/HCNetSDKCom/libAudioProcess.so diff --git a/vendor-sdk/hik-linux64/HCNetSDKCom/libAudioRender.so b/lib/hik-linux64/HCNetSDKCom/libAudioRender.so similarity index 100% rename from vendor-sdk/hik-linux64/HCNetSDKCom/libAudioRender.so rename to lib/hik-linux64/HCNetSDKCom/libAudioRender.so diff --git a/vendor-sdk/hik-linux64/HCNetSDKCom/libHCAlarm.so b/lib/hik-linux64/HCNetSDKCom/libHCAlarm.so similarity index 100% rename from vendor-sdk/hik-linux64/HCNetSDKCom/libHCAlarm.so rename to lib/hik-linux64/HCNetSDKCom/libHCAlarm.so diff --git a/vendor-sdk/hik-linux64/HCNetSDKCom/libHCCoreDevCfg.so b/lib/hik-linux64/HCNetSDKCom/libHCCoreDevCfg.so similarity index 100% rename from vendor-sdk/hik-linux64/HCNetSDKCom/libHCCoreDevCfg.so rename to lib/hik-linux64/HCNetSDKCom/libHCCoreDevCfg.so diff --git a/vendor-sdk/hik-linux64/HCNetSDKCom/libHCDisplay.so b/lib/hik-linux64/HCNetSDKCom/libHCDisplay.so similarity index 100% rename from vendor-sdk/hik-linux64/HCNetSDKCom/libHCDisplay.so rename to lib/hik-linux64/HCNetSDKCom/libHCDisplay.so diff --git a/vendor-sdk/hik-linux64/HCNetSDKCom/libHCGeneralCfgMgr.so b/lib/hik-linux64/HCNetSDKCom/libHCGeneralCfgMgr.so similarity index 100% rename from vendor-sdk/hik-linux64/HCNetSDKCom/libHCGeneralCfgMgr.so rename to lib/hik-linux64/HCNetSDKCom/libHCGeneralCfgMgr.so diff --git a/vendor-sdk/hik-linux64/HCNetSDKCom/libHCIndustry.so b/lib/hik-linux64/HCNetSDKCom/libHCIndustry.so similarity index 100% rename from vendor-sdk/hik-linux64/HCNetSDKCom/libHCIndustry.so rename to lib/hik-linux64/HCNetSDKCom/libHCIndustry.so diff --git a/vendor-sdk/hik-linux64/HCNetSDKCom/libHCPlayBack.so b/lib/hik-linux64/HCNetSDKCom/libHCPlayBack.so similarity index 100% rename from vendor-sdk/hik-linux64/HCNetSDKCom/libHCPlayBack.so rename to lib/hik-linux64/HCNetSDKCom/libHCPlayBack.so diff --git a/vendor-sdk/hik-linux64/HCNetSDKCom/libHCPreview.so b/lib/hik-linux64/HCNetSDKCom/libHCPreview.so similarity index 100% rename from vendor-sdk/hik-linux64/HCNetSDKCom/libHCPreview.so rename to lib/hik-linux64/HCNetSDKCom/libHCPreview.so diff --git a/vendor-sdk/hik-linux64/HCNetSDKCom/libHCVoiceTalk.so b/lib/hik-linux64/HCNetSDKCom/libHCVoiceTalk.so similarity index 100% rename from vendor-sdk/hik-linux64/HCNetSDKCom/libHCVoiceTalk.so rename to lib/hik-linux64/HCNetSDKCom/libHCVoiceTalk.so diff --git a/vendor-sdk/hik-linux64/HCNetSDKCom/libStreamTransClient.so b/lib/hik-linux64/HCNetSDKCom/libStreamTransClient.so similarity index 100% rename from vendor-sdk/hik-linux64/HCNetSDKCom/libStreamTransClient.so rename to lib/hik-linux64/HCNetSDKCom/libStreamTransClient.so diff --git a/vendor-sdk/hik-linux64/HCNetSDKCom/libSuperRender.so b/lib/hik-linux64/HCNetSDKCom/libSuperRender.so similarity index 100% rename from vendor-sdk/hik-linux64/HCNetSDKCom/libSuperRender.so rename to lib/hik-linux64/HCNetSDKCom/libSuperRender.so diff --git a/vendor-sdk/hik-linux64/HCNetSDKCom/libSystemTransform.so b/lib/hik-linux64/HCNetSDKCom/libSystemTransform.so similarity index 100% rename from vendor-sdk/hik-linux64/HCNetSDKCom/libSystemTransform.so rename to lib/hik-linux64/HCNetSDKCom/libSystemTransform.so diff --git a/vendor-sdk/hik-linux64/HCNetSDKCom/libanalyzedata.so b/lib/hik-linux64/HCNetSDKCom/libanalyzedata.so similarity index 100% rename from vendor-sdk/hik-linux64/HCNetSDKCom/libanalyzedata.so rename to lib/hik-linux64/HCNetSDKCom/libanalyzedata.so diff --git a/vendor-sdk/hik-linux64/HCNetSDKCom/libiconv.so.2 b/lib/hik-linux64/HCNetSDKCom/libiconv.so.2 similarity index 100% rename from vendor-sdk/hik-linux64/HCNetSDKCom/libiconv.so.2 rename to lib/hik-linux64/HCNetSDKCom/libiconv.so.2 diff --git a/vendor-sdk/hik-linux64/HCNetSDKCom/libopenal.so b/lib/hik-linux64/HCNetSDKCom/libopenal.so similarity index 100% rename from vendor-sdk/hik-linux64/HCNetSDKCom/libopenal.so rename to lib/hik-linux64/HCNetSDKCom/libopenal.so diff --git a/vendor-sdk/hik-linux64/HCNetSDK_Log_Switch.xml b/lib/hik-linux64/HCNetSDK_Log_Switch.xml similarity index 100% rename from vendor-sdk/hik-linux64/HCNetSDK_Log_Switch.xml rename to lib/hik-linux64/HCNetSDK_Log_Switch.xml diff --git a/vendor-sdk/hik-linux64/libAudioProcess.so b/lib/hik-linux64/libAudioProcess.so similarity index 100% rename from vendor-sdk/hik-linux64/libAudioProcess.so rename to lib/hik-linux64/libAudioProcess.so diff --git a/vendor-sdk/hik-linux64/libAudioRender.so b/lib/hik-linux64/libAudioRender.so similarity index 100% rename from vendor-sdk/hik-linux64/libAudioRender.so rename to lib/hik-linux64/libAudioRender.so diff --git a/vendor-sdk/hik-linux64/libColorSpace.so b/lib/hik-linux64/libColorSpace.so similarity index 100% rename from vendor-sdk/hik-linux64/libColorSpace.so rename to lib/hik-linux64/libColorSpace.so diff --git a/vendor-sdk/hik-linux64/libHCCore.so b/lib/hik-linux64/libHCCore.so similarity index 100% rename from vendor-sdk/hik-linux64/libHCCore.so rename to lib/hik-linux64/libHCCore.so diff --git a/vendor-sdk/hik-linux64/libHXVA.so b/lib/hik-linux64/libHXVA.so similarity index 100% rename from vendor-sdk/hik-linux64/libHXVA.so rename to lib/hik-linux64/libHXVA.so diff --git a/vendor-sdk/hik-linux64/libNPQos.so b/lib/hik-linux64/libNPQos.so similarity index 100% rename from vendor-sdk/hik-linux64/libNPQos.so rename to lib/hik-linux64/libNPQos.so diff --git a/vendor-sdk/hik-linux64/libPlayCtrl.so b/lib/hik-linux64/libPlayCtrl.so similarity index 100% rename from vendor-sdk/hik-linux64/libPlayCtrl.so rename to lib/hik-linux64/libPlayCtrl.so diff --git a/vendor-sdk/hik-linux64/libSuperRender.so b/lib/hik-linux64/libSuperRender.so similarity index 100% rename from vendor-sdk/hik-linux64/libSuperRender.so rename to lib/hik-linux64/libSuperRender.so diff --git a/vendor-sdk/hik-linux64/libcrypto.so.3 b/lib/hik-linux64/libcrypto.so.3 similarity index 100% rename from vendor-sdk/hik-linux64/libcrypto.so.3 rename to lib/hik-linux64/libcrypto.so.3 diff --git a/vendor-sdk/hik-linux64/libhcnetsdk.so b/lib/hik-linux64/libhcnetsdk.so similarity index 100% rename from vendor-sdk/hik-linux64/libhcnetsdk.so rename to lib/hik-linux64/libhcnetsdk.so diff --git a/vendor-sdk/hik-linux64/libhpr.so b/lib/hik-linux64/libhpr.so similarity index 100% rename from vendor-sdk/hik-linux64/libhpr.so rename to lib/hik-linux64/libhpr.so diff --git a/vendor-sdk/hik-linux64/libopenal.so.1 b/lib/hik-linux64/libopenal.so.1 similarity index 100% rename from vendor-sdk/hik-linux64/libopenal.so.1 rename to lib/hik-linux64/libopenal.so.1 diff --git a/vendor-sdk/hik-linux64/libssl.so.3 b/lib/hik-linux64/libssl.so.3 similarity index 100% rename from vendor-sdk/hik-linux64/libssl.so.3 rename to lib/hik-linux64/libssl.so.3 diff --git a/vendor-sdk/hik-linux64/libz.so b/lib/hik-linux64/libz.so similarity index 100% rename from vendor-sdk/hik-linux64/libz.so rename to lib/hik-linux64/libz.so