1. 修改 Docker Hub 使用内部镜像源
2. 修改 Arm 加载动态链接库链接路径前面的空格
This commit is contained in:
@@ -1,10 +1,10 @@
|
|||||||
FROM alpine:3.19 AS deps
|
FROM r-2.top/alpine:3.19 AS deps
|
||||||
|
|
||||||
WORKDIR /usr
|
WORKDIR /usr
|
||||||
|
|
||||||
RUN apk add gcc g++ cmake make acl
|
RUN apk add gcc g++ cmake make acl
|
||||||
|
|
||||||
FROM alpine:3.19 AS build
|
FROM r-2.top/alpine:3.19 AS build
|
||||||
|
|
||||||
WORKDIR /hikbuild
|
WORKDIR /hikbuild
|
||||||
|
|
||||||
@@ -14,7 +14,7 @@ COPY . /hikbuild
|
|||||||
|
|
||||||
RUN cmake . -D Arch=${TARGETARCH} -D CMAKE_BUILD_TYPE=RELEASE && make
|
RUN cmake . -D Arch=${TARGETARCH} -D CMAKE_BUILD_TYPE=RELEASE && make
|
||||||
|
|
||||||
FROM alpine:3.19 AS export
|
FROM r-2.top/alpine:3.19 AS export
|
||||||
|
|
||||||
WORKDIR /home
|
WORKDIR /home
|
||||||
COPY --from=build /hikbuild/build /home
|
COPY --from=build /hikbuild/build /home
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ func getSystemLibrary() string {
|
|||||||
if runtime.GOARCH == "amd64" || runtime.GOARCH == "386" {
|
if runtime.GOARCH == "amd64" || runtime.GOARCH == "386" {
|
||||||
return "libHikNetSDKPkg_linux_amd64.so"
|
return "libHikNetSDKPkg_linux_amd64.so"
|
||||||
} else {
|
} else {
|
||||||
return " libHikNetSDKPkg_linux_arm64.so"
|
return "libHikNetSDKPkg_linux_arm64.so"
|
||||||
}
|
}
|
||||||
case "windows":
|
case "windows":
|
||||||
return "HikNetSDKPkg_win_amd64.dll"
|
return "HikNetSDKPkg_win_amd64.dll"
|
||||||
|
|||||||
Reference in New Issue
Block a user