Merge remote-tracking branch 'upstream/master'

patch wg-quick. fix sysctl (#2630 )
no unneeded sysctl
2026-05-22 23:32:00 +02:00 · 2026-05-21 11:59:46 +02:00
1 changed files with 4 additions and 2 deletions
@@ -21,7 +21,8 @@ RUN apk add linux-headers build-base go git && \
    cd amneziawg-go && \
    make && \
    cd ../amneziawg-tools/src && \
-    make
+    make && \
+    sed -i 's|\[\[ $proto == -4 \]\] && cmd sysctl -q net\.ipv4\.conf\.all\.src_valid_mark=1|[[ $proto == -4 ]] \&\& [[ $(sysctl -n net.ipv4.conf.all.src_valid_mark) != 1 ]] \&\& cmd sysctl -q net.ipv4.conf.all.src_valid_mark=1|' ./wg-quick/linux.bash

 FROM docker.io/library/node:krypton-alpine AS build-libsql
 WORKDIR /app
@@ -62,7 +63,8 @@ RUN apk add --no-cache \
    kmod \
    iptables-legacy \
    wireguard-go \
-    wireguard-tools
+    wireguard-tools && \
+    sed -i 's|\[\[ $proto == -4 \]\] && cmd sysctl -q net\.ipv4\.conf\.all\.src_valid_mark=1|[[ $proto == -4 ]] \&\& [[ $(sysctl -n net.ipv4.conf.all.src_valid_mark) != 1 ]] \&\& cmd sysctl -q net.ipv4.conf.all.src_valid_mark=1|' /usr/bin/wg-quick

 RUN mkdir -p /etc/amnezia
 RUN ln -s /etc/wireguard /etc/amnezia/amneziawg
Author	SHA1	Message	Date
theis.gaedigk	9581e6eacb	Merge remote-tracking branch 'upstream/master' CodeQL / Analyze (javascript-typescript) (push) Has been cancelled Details Edge / Build Docker (map[os:ubuntu-24.04-arm platform:linux/arm64]) (push) Has been cancelled Details Edge / Build Docker (map[os:ubuntu-latest platform:linux/amd64]) (push) Has been cancelled Details Lint / Check Docs (push) Has been cancelled Details Edge / Merge & Deploy Docker (push) Has been cancelled Details Edge / Build & Deploy Docs (push) Has been cancelled Details Lint / Lint (format:check) (push) Has been cancelled Details Lint / Lint (lint) (push) Has been cancelled Details Lint / Lint (typecheck) (push) Has been cancelled Details	2026-05-22 23:32:00 +02:00
Bernd Storath	90e2bbe0a6	patch wg-quick. fix sysctl (#2630 ) no unneeded sysctl	2026-05-21 11:59:46 +02:00