Merge pull request #237 from linuxserver/sysctl

patch wg-quick to suppress false sysctl warning

Author: aptalca

Dockerfile

@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy
 
 # set version label
@@ -15,19 +17,16 @@ RUN \
   apt-get install -y --no-install-recommends \
     bc \
     build-essential \
-    curl \
     dkms \
     git \
-    gnupg \ 
+    gnupg \
     ifupdown \
     iproute2 \
     iptables \
     iputils-ping \
-    jq \
     libc6 \
     libelf-dev \
     net-tools \
-    netcat \
     openresolv \
     perl \
     pkg-config \
@@ -43,6 +42,7 @@ RUN \
   git clone https://git.zx2c4.com/wireguard-tools && \
   cd wireguard-tools && \
   git checkout "${WIREGUARD_RELEASE}" && \
+  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|' src/wg-quick/linux.bash && \
   make -C src -j$(nproc) && \
   make -C src install && \
   echo "**** install CoreDNS ****" && \

Dockerfile.aarch64

@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy
 
 # set version label
@@ -15,19 +17,16 @@ RUN \
   apt-get install -y --no-install-recommends \
     bc \
     build-essential \
-    curl \
     dkms \
     git \
-    gnupg \ 
+    gnupg \
     ifupdown \
     iproute2 \
     iptables \
     iputils-ping \
-    jq \
     libc6 \
     libelf-dev \
     net-tools \
-    netcat \
     openresolv \
     perl \
     pkg-config \
@@ -43,6 +42,7 @@ RUN \
   git clone https://git.zx2c4.com/wireguard-tools && \
   cd wireguard-tools && \
   git checkout "${WIREGUARD_RELEASE}" && \
+  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|' src/wg-quick/linux.bash && \
   make -C src -j$(nproc) && \
   make -C src install && \
   echo "**** install CoreDNS ****" && \

Dockerfile.armhf

@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy
 
 # set version label
@@ -15,19 +17,16 @@ RUN \
   apt-get install -y --no-install-recommends \
     bc \
     build-essential \
-    curl \
     dkms \
     git \
-    gnupg \ 
+    gnupg \
     ifupdown \
     iproute2 \
     iptables \
     iputils-ping \
-    jq \
     libc6 \
     libelf-dev \
     net-tools \
-    netcat \
     openresolv \
     perl \
     pkg-config \
@@ -43,6 +42,7 @@ RUN \
   git clone https://git.zx2c4.com/wireguard-tools && \
   cd wireguard-tools && \
   git checkout "${WIREGUARD_RELEASE}" && \
+  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|' src/wg-quick/linux.bash && \
   make -C src -j$(nproc) && \
   make -C src install && \
   echo "**** install CoreDNS ****" && \

README.md

@@ -332,6 +332,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **28.01.23:** - Patch wg-quick to suppress false positive sysctl warning.
 * **10.01.23:** - Add new var to add `PersistentKeepalive` to server config for select peers to survive server IP changes when domain name is used.
 * **26.10.22:** - Better handle unsupported peer names. Improve logging.
 * **12.10.22:** - Add Alpine branch. Optimize wg and coredns services.

readme-vars.yml

@@ -127,6 +127,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "28.01.23:", desc: "Patch wg-quick to suppress false positive sysctl warning." }
   - { date: "10.01.23:", desc: "Add new var to add `PersistentKeepalive` to server config for select peers to survive server IP changes when domain name is used." }
   - { date: "26.10.22:", desc: "Better handle unsupported peer names. Improve logging." }
   - { date: "12.10.22:", desc: "Add Alpine branch. Optimize wg and coredns services." }