remove unneeded dockerfiles and scripts

thomasferrandiz · Nov 29, 2023 · e226990 · e226990
1 parent bc3fcc3
commit e226990
Show file tree

Hide file tree

Showing 15 changed files with 6 additions and 110 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,7 +20,6 @@ on:
 
 env:
   GO_VERSION: "1.20.5"
-  LINUX_ARCHES: "amd64 386 arm arm64 s390x mips64le ppc64le"
   REPOSITORY: flannel/flannel-cni-plugin
 
 jobs:

diff --git 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 riscv64; do \
+    for arch in amd64 386 arm arm64 s390x ppc64le riscv64; 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 riscv64; do \
+    for arch in amd64 386 arm arm64 s390x ppc64le riscv64; do \
         GOARCH=${arch} ./scripts/check_static.sh >> static-check.log; \
     done
 

diff --git a/Dockerfile.amd64 b/Dockerfile.amd64
diff --git a/Dockerfile.arm b/Dockerfile.arm
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
diff --git a/Dockerfile.linux b/Dockerfile.linux
diff --git a/Dockerfile.mips64le b/Dockerfile.mips64le
diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le
diff --git a/Dockerfile.riscv64 b/Dockerfile.riscv64
diff --git a/Dockerfile.s390x b/Dockerfile.s390x
diff --git a/Dockerfile.windows b/Dockerfile.windows
diff --git a/Makefile b/Makefile
@@ -32,22 +32,9 @@ build_all_linux: vendor
 	GOOS=linux GOARCH=arm scripts/build_flannel.sh
 	GOOS=linux GOARCH=arm64 scripts/build_flannel.sh
 	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=riscv64 scripts/build_flannel.sh
 
-
-build_all_linux_for_images: vendor
-	GOOS=linux GOARCH=amd64 scripts/build_flannel_for_images.sh
-	GOOS=linux GOARCH=386 scripts/build_flannel_for_images.sh
-	GOOS=linux GOARCH=arm scripts/build_flannel_for_images.sh
-	GOOS=linux GOARCH=arm64 scripts/build_flannel_for_images.sh
-	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=riscv64 scripts/build_flannel_for_images.sh
-
-
 vendor:
 	go mod tidy
 	go mod vendor

diff --git a/scripts/build_flannel_for_images.sh b/scripts/build_flannel_for_images.sh
diff --git 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 riscv64; do
+for arch in amd64 386 arm arm64 s390x ppc64le riscv64; 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 riscv64; do
+for arch in amd64 386 arm arm64 s390x ppc64le riscv64; do
   GOOS=${GOOS:-$("${GO}" env GOOS)}
   RELEASE_DIR=release \
   OUTPUT_DIR=dist \

diff --git 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 riscv64; do \
+    for arch in amd64 386 arm arm64 s390x ppc64le riscv64; 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 riscv64; do \
+    for arch in amd64 386 arm arm64 s390x ppc64le riscv64; do \
         GOARCH=\$arch ./scripts/check_static.sh >> static-check.log; \
     done;
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,6 @@ on: @@
     env:
       GO_VERSION: "1.20.5"
-      LINUX_ARCHES: "amd64 386 arm arm64 s390x mips64le ppc64le"
       REPOSITORY: flannel/flannel-cni-plugin
     jobs:
@@ Expand Down @@