From b9dc3c44a8c3c118e330121cb01879bfbbe76d0d Mon Sep 17 00:00:00 2001 From: hinakumo <47789168+hinakumo@users.noreply.github.com> Date: Sat, 12 Jul 2025 09:08:10 +0300 Subject: [PATCH 1/5] Change AWG repos in Dockerfile --- docker/Dockerfile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 0364a32..2b42046 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ FROM golang:1.24 AS awg -RUN git clone https://github.com/amnezia-vpn/amneziawg-go /awg +RUN git clone https://github.com/WGDashboard/amneziawg-go /awg WORKDIR /awg RUN go mod download && \ go mod verify && \ @@ -13,10 +13,14 @@ RUN apk update && apk add \ iproute2 iptables bash curl wget unzip procps sudo \ tzdata wireguard-tools python3 py3-psutil py3-bcrypt openresolv \ && cd /usr/bin/ \ - && wget $(curl -s https://api.github.com/repos/amnezia-vpn/amneziawg-tools/releases/latest | grep 'alpine' | cut -d : -f 2,3 | tr -d '", ' | tail -n 1) \ - && unzip -j alpine-3.19-amneziawg-tools.zip \ + && git clone https://github.com/WGDashboard/amneziawg-tools \ + && cd amneziawg-tools \ + && cd src \ + && make \ + && make install \ && chmod +x /usr/bin/awg /usr/bin/awg-quick \ - && rm alpine-3.19-amneziawg-tools.zip + && cd .. && cd .. \ + && rm -R amneziawg-tools COPY --from=awg /usr/bin/amneziawg-go /usr/bin/amneziawg-go From 3f9d9732a0b46dc069e5f5a8e4f1e344380fec74 Mon Sep 17 00:00:00 2001 From: hinakumo <47789168+hinakumo@users.noreply.github.com> Date: Sat, 12 Jul 2025 09:21:29 +0300 Subject: [PATCH 2/5] Added build packages deps to Dockerfile --- docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index 2b42046..a3faa3a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -12,6 +12,7 @@ LABEL maintainer="dselen@nerthus.nl" RUN apk update && apk add \ iproute2 iptables bash curl wget unzip procps sudo \ tzdata wireguard-tools python3 py3-psutil py3-bcrypt openresolv \ + make git build-base linux-headers \ && cd /usr/bin/ \ && git clone https://github.com/WGDashboard/amneziawg-tools \ && cd amneziawg-tools \ From f1aa064b2d6c93e240fa4a533862bcbd78d85920 Mon Sep 17 00:00:00 2001 From: hinakumo <47789168+hinakumo@users.noreply.github.com> Date: Mon, 14 Jul 2025 01:26:01 +0300 Subject: [PATCH 3/5] Made CDs more direct --- docker/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index a3faa3a..1e2d84d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -15,12 +15,11 @@ RUN apk update && apk add \ make git build-base linux-headers \ && cd /usr/bin/ \ && git clone https://github.com/WGDashboard/amneziawg-tools \ - && cd amneziawg-tools \ - && cd src \ + && cd amneziawg-tools/src \ && make \ && make install \ && chmod +x /usr/bin/awg /usr/bin/awg-quick \ - && cd .. && cd .. \ + && cd ../.. \ && rm -R amneziawg-tools COPY --from=awg /usr/bin/amneziawg-go /usr/bin/amneziawg-go From 0cb46e14447c865401fed6f2eabef86cc88491c7 Mon Sep 17 00:00:00 2001 From: Daan Selen Date: Thu, 24 Jul 2025 20:23:42 +0200 Subject: [PATCH 4/5] Docker file update --- .github/workflows/stale.yml | 2 +- docker/Dockerfile | 26 ++++++++++++++------------ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 4ad4903..01e4441 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -22,5 +22,5 @@ jobs: stale-issue-message: 'This issue has not been updated for 20 days' stale-pr-message: 'This pull request has not been updated for 20 days' stale-issue-label: 'stale' - exempt-issue-labels: 'enhancement,ongoing' + exempt-issue-labels: 'ongoing' days-before-stale: 20 diff --git a/docker/Dockerfile b/docker/Dockerfile index 1e2d84d..8e659de 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24 AS awg +FROM golang:1.24 AS awg-go RUN git clone https://github.com/WGDashboard/amneziawg-go /awg WORKDIR /awg @@ -6,23 +6,25 @@ RUN go mod download && \ go mod verify && \ go build -ldflags '-linkmode external -extldflags "-fno-PIC -static"' -v -o /usr/bin -FROM alpine:latest -LABEL maintainer="dselen@nerthus.nl" +FROM alpine:latest AS awg-tools -RUN apk update && apk add \ - iproute2 iptables bash curl wget unzip procps sudo \ - tzdata wireguard-tools python3 py3-psutil py3-bcrypt openresolv \ +RUN apk update && apk add --no-cache \ make git build-base linux-headers \ - && cd /usr/bin/ \ && git clone https://github.com/WGDashboard/amneziawg-tools \ && cd amneziawg-tools/src \ && make \ - && make install \ - && chmod +x /usr/bin/awg /usr/bin/awg-quick \ - && cd ../.. \ - && rm -R amneziawg-tools + && chmod +x wg* -COPY --from=awg /usr/bin/amneziawg-go /usr/bin/amneziawg-go +FROM alpine:latest +LABEL maintainer="dselen@nerthus.nl" + +RUN apk update && apk add --no-cache \ + iproute2 iptables bash curl wget unzip procps sudo \ + tzdata wireguard-tools python3 py3-psutil py3-bcrypt openresolv + +COPY --from=awg-go /usr/bin/amneziawg-go /usr/bin/amneziawg-go +COPY --from=awg-tools /amneziawg-tools/src/wg /usr/bin/awg +COPY --from=awg-tools /amneziawg-tools/src/wg-quick/linux.bash /usr/bin/awg-quick # Declaring environment variables, change Peernet to an address you like, standard is a 24 bit subnet. ARG wg_net="10.0.0.1" \ From 0cd2c6864e67919f207586e53fe5c073f02df7d7 Mon Sep 17 00:00:00 2001 From: Daan Selen Date: Thu, 24 Jul 2025 20:27:54 +0200 Subject: [PATCH 5/5] make stale compliant --- .github/workflows/stale.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 01e4441..4ad4903 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -22,5 +22,5 @@ jobs: stale-issue-message: 'This issue has not been updated for 20 days' stale-pr-message: 'This pull request has not been updated for 20 days' stale-issue-label: 'stale' - exempt-issue-labels: 'ongoing' + exempt-issue-labels: 'enhancement,ongoing' days-before-stale: 20