diff --git a/.drone.yml b/.drone.yml index dcfc67a..22ebdeb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,7 +3,7 @@ type: kubernetes name: default node_selector: - physical-node: dev2 + physical-node: dev1 trigger: branch: diff --git a/Dockerfile b/Dockerfile index b3e010e..9668fad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine -RUN apk add --update --no-cache iptables iptables-legacy openssl jq curl ca-certificates busybox-extras docker-cli +RUN apk add --update --no-cache iptables iptables-legacy openssl jq curl ca-certificates busybox-extras docker-cli nftables COPY firewall/ /firewall/ CMD firewall/iptables-wrapper-installer.sh && /firewall/firewall-add diff --git a/firewall/firewall-add b/firewall/firewall-add index c6e4458..966ab64 100755 --- a/firewall/firewall-add +++ b/firewall/firewall-add @@ -484,6 +484,9 @@ for source_ip_index in $(seq 1 $COUNT_SOURCE_IP); do else debug "$IPTABLES -I $CHAIN -p $PROTOCOL $IPTABLES_OPTIONS -m comment --comment "$COMMENT" -j ACCEPT" $IPTABLES -w -I $CHAIN -p $PROTOCOL $IPTABLES_OPTIONS -m comment --comment "$COMMENT" -j ACCEPT + if [ "$IPTABLES" == "/usr/sbin/iptables" ]; then + /usr/sbin/nft delete table ip raw 2>/dev/null || true + fi fi fi #############################