diff --git a/natter-docker/Dockerfile.alpine-amd64 b/natter-docker/Dockerfile.alpine-amd64 index d7f54c4..f219757 100644 --- a/natter-docker/Dockerfile.alpine-amd64 +++ b/natter-docker/Dockerfile.alpine-amd64 @@ -1,12 +1,12 @@ ARG ARCH=amd64 -FROM --platform=linux/${ARCH} amd64/alpine:3.19 +FROM --platform=linux/${ARCH} amd64/alpine:3.22 COPY natter.py /opt/natter.py RUN apk update \ && apk add ca-certificates curl gzip iptables iptables-legacy jq nftables python3 socat wget \ && ln -sf iptables-legacy /sbin/iptables \ - && curl -L 'https://github.com/ginuerzh/gost/releases/download/v2.11.5/gost-linux-amd64-2.11.5.gz' | gunzip > /usr/bin/gost \ + && curl -fL 'https://github.com/go-gost/gost/releases/download/v3.2.4/gost_3.2.4_linux_amd64.tar.gz' | tar -xzO gost > /usr/bin/gost \ && chmod a+x /usr/bin/gost \ && chmod a+x /opt/natter.py diff --git a/natter-docker/Dockerfile.alpine-arm64 b/natter-docker/Dockerfile.alpine-arm64 index b5455e9..2fe7a04 100644 --- a/natter-docker/Dockerfile.alpine-arm64 +++ b/natter-docker/Dockerfile.alpine-arm64 @@ -1,12 +1,12 @@ ARG ARCH=arm64 -FROM --platform=linux/${ARCH} arm64v8/alpine:3.19 +FROM --platform=linux/${ARCH} arm64v8/alpine:3.22 COPY natter.py /opt/natter.py RUN apk update \ && apk add ca-certificates curl gzip iptables iptables-legacy jq nftables python3 socat wget \ && ln -sf iptables-legacy /sbin/iptables \ - && curl -L 'https://github.com/ginuerzh/gost/releases/download/v2.11.5/gost-linux-armv8-2.11.5.gz' | gunzip > /usr/bin/gost \ + && curl -fL 'https://github.com/go-gost/gost/releases/download/v3.2.4/gost_3.2.4_linux_arm64.tar.gz' | tar -xzO gost > /usr/bin/gost \ && chmod a+x /usr/bin/gost \ && chmod a+x /opt/natter.py diff --git a/natter-docker/Dockerfile.debian-amd64 b/natter-docker/Dockerfile.debian-amd64 index 884ede3..f3c114c 100644 --- a/natter-docker/Dockerfile.debian-amd64 +++ b/natter-docker/Dockerfile.debian-amd64 @@ -1,12 +1,12 @@ ARG ARCH=amd64 -FROM --platform=linux/${ARCH} amd64/debian:12 +FROM --platform=linux/${ARCH} amd64/debian:13 COPY natter.py /opt/natter.py RUN apt-get update \ && apt-get install -y --no-install-recommends ca-certificates curl gzip iptables jq nftables python3 socat wget \ && update-alternatives --set iptables /usr/sbin/iptables-legacy \ - && curl -L 'https://github.com/ginuerzh/gost/releases/download/v2.11.5/gost-linux-amd64-2.11.5.gz' | gunzip > /usr/bin/gost \ + && curl -fL 'https://github.com/go-gost/gost/releases/download/v3.2.4/gost_3.2.4_linux_amd64.tar.gz' | tar -xzO gost > /usr/bin/gost \ && chmod a+x /usr/bin/gost \ && chmod a+x /opt/natter.py diff --git a/natter-docker/Dockerfile.debian-arm64 b/natter-docker/Dockerfile.debian-arm64 index 06ac73b..c155320 100644 --- a/natter-docker/Dockerfile.debian-arm64 +++ b/natter-docker/Dockerfile.debian-arm64 @@ -1,12 +1,12 @@ ARG ARCH=arm64 -FROM --platform=linux/${ARCH} arm64v8/debian:12 +FROM --platform=linux/${ARCH} arm64v8/debian:13 COPY natter.py /opt/natter.py RUN apt-get update \ && apt-get install -y --no-install-recommends ca-certificates curl gzip iptables jq nftables python3 socat wget \ && update-alternatives --set iptables /usr/sbin/iptables-legacy \ - && curl -L 'https://github.com/ginuerzh/gost/releases/download/v2.11.5/gost-linux-armv8-2.11.5.gz' | gunzip > /usr/bin/gost \ + && curl -fL 'https://github.com/go-gost/gost/releases/download/v3.2.4/gost_3.2.4_linux_arm64.tar.gz' | tar -xzO gost > /usr/bin/gost \ && chmod a+x /usr/bin/gost \ && chmod a+x /opt/natter.py diff --git a/natter-docker/Dockerfile.minimal-amd64 b/natter-docker/Dockerfile.minimal-amd64 index 84ad6c0..7581008 100644 --- a/natter-docker/Dockerfile.minimal-amd64 +++ b/natter-docker/Dockerfile.minimal-amd64 @@ -1,5 +1,5 @@ ARG ARCH=amd64 -FROM --platform=linux/${ARCH} openwrt/rootfs:x86-64-23.05.2 AS builder +FROM --platform=linux/${ARCH} openwrt/rootfs:x86-64-24.10.2 AS builder COPY natter.py /opt/natter.py diff --git a/natter-docker/Dockerfile.minimal-arm64 b/natter-docker/Dockerfile.minimal-arm64 index 01d7b80..4133706 100644 --- a/natter-docker/Dockerfile.minimal-arm64 +++ b/natter-docker/Dockerfile.minimal-arm64 @@ -1,5 +1,5 @@ ARG ARCH=aarch64_generic -FROM --platform=linux/${ARCH} openwrt/rootfs:aarch64_generic-23.05.2 AS builder +FROM --platform=linux/${ARCH} openwrt/rootfs:aarch64_generic-24.10.2 AS builder COPY natter.py /opt/natter.py diff --git a/natter-docker/Dockerfile.openwrt-amd64 b/natter-docker/Dockerfile.openwrt-amd64 index 5311c99..d359acc 100644 --- a/natter-docker/Dockerfile.openwrt-amd64 +++ b/natter-docker/Dockerfile.openwrt-amd64 @@ -1,5 +1,5 @@ ARG ARCH=amd64 -FROM --platform=linux/${ARCH} openwrt/rootfs:x86-64-23.05.2 AS builder +FROM --platform=linux/${ARCH} openwrt/rootfs:x86-64-24.10.2 AS builder COPY natter.py /opt/natter.py @@ -7,7 +7,7 @@ RUN mkdir -p /var/lock/ /var/run/ \ && opkg update \ && opkg install ca-certificates curl gzip iptables-legacy jq nftables python3 socat wget \ && opkg remove 'kmod-*' --force-depends \ - && curl -L 'https://github.com/ginuerzh/gost/releases/download/v2.11.5/gost-linux-amd64-2.11.5.gz' | gunzip > /usr/bin/gost \ + && curl -fL 'https://github.com/go-gost/gost/releases/download/v3.2.4/gost_3.2.4_linux_amd64.tar.gz' | tar -xzO gost > /usr/bin/gost \ && chmod a+x /usr/bin/gost \ && chmod a+x /opt/natter.py diff --git a/natter-docker/Dockerfile.openwrt-arm64 b/natter-docker/Dockerfile.openwrt-arm64 index 2f26850..83e588f 100644 --- a/natter-docker/Dockerfile.openwrt-arm64 +++ b/natter-docker/Dockerfile.openwrt-arm64 @@ -1,5 +1,5 @@ ARG ARCH=aarch64_generic -FROM --platform=linux/${ARCH} openwrt/rootfs:aarch64_generic-23.05.2 AS builder +FROM --platform=linux/${ARCH} openwrt/rootfs:aarch64_generic-24.10.2 AS builder COPY natter.py /opt/natter.py @@ -7,7 +7,7 @@ RUN mkdir -p /var/lock/ /var/run/ \ && opkg update \ && opkg install ca-certificates curl gzip iptables-legacy jq nftables python3 socat wget \ && opkg remove 'kmod-*' --force-depends \ - && curl -L 'https://github.com/ginuerzh/gost/releases/download/v2.11.5/gost-linux-armv8-2.11.5.gz' | gunzip > /usr/bin/gost \ + && curl -fL 'https://github.com/go-gost/gost/releases/download/v3.2.4/gost_3.2.4_linux_arm64.tar.gz' | tar -xzO gost > /usr/bin/gost \ && chmod a+x /usr/bin/gost \ && chmod a+x /opt/natter.py