diff --git a/Dockerfile b/Dockerfile index 258ca4a..a41a853 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,7 +42,7 @@ RUN go mod vendor && go mod tidy # for ARCH IN ${ALL_ARCH}; do RUN \ - for arch in amd64 386 arm arm64 s390x ppc64le riscv64; do \ + for arch in amd64 386 arm arm64 s390x ppc64le riscv64 loong64; do \ GOARCH=${arch} ./scripts/build_flannel.sh; \ for format in tgz; do \ FILENAME=cni-plugin-flannel-linux-${arch}-${TAG}.${format}; \ @@ -60,7 +60,7 @@ RUN \ done RUN \ - for arch in amd64 386 arm arm64 s390x ppc64le riscv64; do \ + for arch in amd64 386 arm arm64 s390x ppc64le riscv64 loong64; do \ GOARCH=${arch} ./scripts/check_static.sh >> static-check.log; \ done diff --git a/Dockerfile.loong64 b/Dockerfile.loong64 new file mode 100644 index 0000000..3f1fe5d --- /dev/null +++ b/Dockerfile.loong64 @@ -0,0 +1,2 @@ +FROM cr.loongnix.cn/library/debian:buster-slim +COPY dist/flannel-loong64 /flannel diff --git a/Makefile b/Makefile index 7225049..aa880e1 100644 --- a/Makefile +++ b/Makefile @@ -34,6 +34,7 @@ build_all_linux: vendor GOOS=linux GOARCH=s390x scripts/build_flannel.sh GOOS=linux GOARCH=ppc64le scripts/build_flannel.sh GOOS=linux GOARCH=riscv64 scripts/build_flannel.sh + GOOS=linux GOARCH=loong64 scripts/build_flannel.sh vendor: go mod tidy diff --git a/scripts/package.sh b/scripts/package.sh index a082f2f..63dc971 100755 --- a/scripts/package.sh +++ b/scripts/package.sh @@ -9,7 +9,7 @@ mkdir -p dist umask 0022 # linux archives -for arch in amd64 386 arm arm64 s390x ppc64le riscv64; do +for arch in amd64 386 arm arm64 s390x ppc64le riscv64 loong64; do echo $arch for format in tgz; do FILENAME=cni-plugin-flannel-linux-$arch-"${TAG}".$format @@ -25,7 +25,7 @@ tar -C "${OUTPUT_DIR}" --owner=0 --group=0 -caf "$FILEPATH" flannel-amd64.exe cd "${SRC_DIR}" # linux -for arch in amd64 386 arm arm64 s390x ppc64le riscv64; do +for arch in amd64 386 arm arm64 s390x ppc64le riscv64 loong64; do GOOS=${GOOS:-$("${GO}" env GOOS)} RELEASE_DIR=release \ OUTPUT_DIR=dist \ diff --git a/scripts/release.sh b/scripts/release.sh index e2aeff8..2293cb6 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -30,7 +30,8 @@ $DOCKER run -ti -v "${SRC_DIR}":z -e TAG="${TAG}" --rm golang:"${GOLANG_VERSION} go mod vendor && go mod tidy - for arch in amd64 386 arm arm64 s390x ppc64le riscv64; do \ + + for arch in amd64 386 arm arm64 s390x ppc64le riscv64 loong64; do \ echo \$arch;\ GOARCH=\$arch ./scripts/build_flannel.sh; \ for format in tgz; do \ @@ -47,7 +48,8 @@ $DOCKER run -ti -v "${SRC_DIR}":z -e TAG="${TAG}" --rm golang:"${GOLANG_VERSION} tar -C ${OUTPUT_DIR} --owner=0 --group=0 -caf \$FILEPATH . ; \ done; - for arch in amd64 386 arm arm64 s390x ppc64le riscv64; do \ + + for arch in amd64 386 arm arm64 s390x ppc64le riscv64 loong64; do \ GOARCH=\$arch ./scripts/check_static.sh >> static-check.log; \ done;