Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "feat: yurthub automatically recognize nftables or iptables (#1135)" #1354

Merged
merged 1 commit into from
Apr 3, 2023
Merged

Revert "feat: yurthub automatically recognize nftables or iptables (#1135)" #1354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions hack/dockerfiles/build/Dockerfile.yurthub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
2 changes: 0 additions & 2 deletions hack/dockerfiles/release/Dockerfile.yurthub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
208 changes: 0 additions & 208 deletions hack/iptables-wrapper-installer.sh
View file
Open in desktop

This file was deleted.