From 3469fdde25bfa238b9d774813a00c07990797893 Mon Sep 17 00:00:00 2001 From: yzewei Date: Mon, 23 Oct 2023 15:26:33 +0800 Subject: [PATCH] add loong64 support --- Dockerfile | 4 ++-- Dockerfile.loong64 | 2 ++ Makefile | 2 ++ scripts/package.sh | 4 ++-- scripts/release.sh | 4 ++-- 5 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 Dockerfile.loong64 diff --git a/Dockerfile b/Dockerfile index 95b1300..f709a8a 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 mips64le ppc64le; do \ + for arch in amd64 386 arm arm64 s390x mips64le ppc64le 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 mips64le ppc64le; do \ + for arch in amd64 386 arm arm64 s390x mips64le ppc64le 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 4d38e48..7bf8540 100644 --- a/Makefile +++ b/Makefile @@ -34,6 +34,7 @@ build_all_linux: vendor GOOS=linux GOARCH=s390x scripts/build_flannel.sh GOOS=linux GOARCH=mips64le scripts/build_flannel.sh GOOS=linux GOARCH=ppc64le scripts/build_flannel.sh + GOOS=linux GOARCH=loong64 scripts/build_flannel.sh build_all_linux_for_images: vendor @@ -44,6 +45,7 @@ build_all_linux_for_images: vendor GOOS=linux GOARCH=s390x scripts/build_flannel_for_images.sh GOOS=linux GOARCH=mips64le scripts/build_flannel_for_images.sh GOOS=linux GOARCH=ppc64le scripts/build_flannel_for_images.sh + GOOS=linux GOARCH=loong64 scripts/build_flannel_for_images.sh vendor: diff --git a/scripts/package.sh b/scripts/package.sh index 3382d5d..3c64eaf 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 mips64le ppc64le; do +for arch in amd64 386 arm arm64 s390x mips64le ppc64le 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 mips64le ppc64le; do +for arch in amd64 386 arm arm64 s390x mips64le ppc64le loong64; do GOOS=${GOOS:-$("${GO}" env GOOS)} RELEASE_DIR=release \ OUTPUT_DIR=dist \ diff --git a/scripts/release.sh b/scripts/release.sh index f901631..acd17cd 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -30,7 +30,7 @@ $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 mips64le ppc64le; do \ + for arch in amd64 386 arm arm64 s390x mips64le ppc64le loong64; do \ echo \$arch;\ GOARCH=\$arch ./scripts/build_flannel.sh; \ for format in tgz; do \ @@ -47,7 +47,7 @@ $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 mips64le ppc64le; do \ + for arch in amd64 386 arm arm64 s390x mips64le ppc64le loong64; do \ GOARCH=\$arch ./scripts/check_static.sh >> static-check.log; \ done;