Revert "feat: yurthub automatically recognize nftables or iptables (#…

…1135) (#1327)" (#1354) This reverts commit 9d0f316.
openyurtio · Apr 3, 2023 · 1802826 · 1802826
1 parent 49219cc
commit 1802826
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 212 deletions.
diff --git a/hack/dockerfiles/build/Dockerfile.yurthub b/hack/dockerfiles/build/Dockerfile.yurthub
@@ -5,6 +5,4 @@ ARG TARGETOS TARGETARCH MIRROR_REPO
 RUN if [ ! -z "${MIRROR_REPO+x}" ]; then sed -i "s/dl-cdn.alpinelinux.org/${MIRROR_REPO}/g" /etc/apk/repositories; fi && \
     apk add ca-certificates bash libc6-compat iptables ip6tables && update-ca-certificates && rm /var/cache/apk/*
 COPY ./_output/local/bin/${TARGETOS}/${TARGETARCH}/yurthub /usr/local/bin/yurthub
-COPY hack/iptables-wrapper-installer.sh /
-RUN chmod +x /iptables-wrapper-installer.sh && /iptables-wrapper-installer.sh
 ENTRYPOINT ["/usr/local/bin/yurthub"]
diff --git a/hack/dockerfiles/release/Dockerfile.yurthub b/hack/dockerfiles/release/Dockerfile.yurthub
@@ -11,6 +11,4 @@ ARG TARGETOS TARGETARCH MIRROR_REPO
 RUN if [ ! -z "${MIRROR_REPO+x}" ]; then sed -i "s/dl-cdn.alpinelinux.org/${MIRROR_REPO}/g" /etc/apk/repositories; fi && \
     apk add ca-certificates bash libc6-compat iptables ip6tables && update-ca-certificates && rm /var/cache/apk/*
 COPY --from=builder /build/_output/local/bin/${TARGETOS}/${TARGETARCH}/yurthub /usr/local/bin/yurthub
-COPY hack/iptables-wrapper-installer.sh /
-RUN chmod +x /iptables-wrapper-installer.sh && /iptables-wrapper-installer.sh
 ENTRYPOINT ["/usr/local/bin/yurthub"]
diff --git a/hack/iptables-wrapper-installer.sh b/hack/iptables-wrapper-installer.sh