Merge pull request #1880 from thomasferrandiz/remove-no-sanity-check

Use manual test to ensure iptables-* binaries are present
flannel-io · Feb 26, 2024 · 001b36d · 001b36d
2 parents aafad21 + d141df8
commit 001b36d
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/images/Dockerfile b/images/Dockerfile
@@ -33,6 +33,9 @@ COPY --from=build /build/dist/flanneld /opt/bin/flanneld
 COPY dist/mk-docker-opts.sh /opt/bin/
 COPY --from=build /iptables-wrapper/iptables-wrapper-installer.sh /
 COPY --from=build /iptables-wrapper/bin/iptables-wrapper /
+# check manually that iptables-legacy and iptables-nft are present since
+# iptables-wrapper-installer.sh sanity check doesn't work for multi-arch build
+RUN which iptables-legacy && which iptables-nft
 RUN /iptables-wrapper-installer.sh --no-sanity-check