Merge pull request #189 from linuxserver/jammy

rebase to jammy, upgrade to s6v3

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:focal
+FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy
 
 # set version label
 ARG BUILD_DATE
@@ -27,6 +27,7 @@ RUN \
 	libc6 \
 	libelf-dev \
 	net-tools \
+	netcat \
 	openresolv \
 	perl \
 	pkg-config \

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy
 
 # set version label
 ARG BUILD_DATE
@@ -27,6 +27,7 @@ RUN \
 	libc6 \
 	libelf-dev \
 	net-tools \
+	netcat \
 	openresolv \
 	perl \
 	pkg-config \

Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy
 
 # set version label
 ARG BUILD_DATE
@@ -27,6 +27,7 @@ RUN \
 	libc6 \
 	libelf-dev \
 	net-tools \
+	netcat \
 	openresolv \
 	perl \
 	pkg-config \

README.md

@@ -317,6 +317,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **04.10.22:** - Rebase to Jammy. Upgrade to s6v3.
 * **16.05.22:** - Improve NAT handling in server mode when multiple ethernet devices are present.
 * **23.04.22:** - Add pre-shared key support. Automatically added to all new peer confs generated, existing ones are left without to ensure no breaking changes.
 * **10.04.22:** - Rebase to Ubuntu Focal. Add `LOG_CONFS` env var. Remove deprecated `add-peer` command.

readme-vars.yml

@@ -121,6 +121,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "04.10.22:", desc: "Rebase to Jammy. Upgrade to s6v3." }
   - { date: "16.05.22:", desc: "Improve NAT handling in server mode when multiple ethernet devices are present." }
   - { date: "23.04.22:", desc: "Add pre-shared key support. Automatically added to all new peer confs generated, existing ones are left without to ensure no breaking changes." }
   - { date: "10.04.22:", desc: "Rebase to Ubuntu Focal. Add `LOG_CONFS` env var. Remove deprecated `add-peer` command." }

root/etc/s6-overlay/s6-rc.d/init-wireguard-confs/run

@@ -172,4 +172,4 @@ fi
 
 # permissions
 chown -R abc:abc \
-  /config
+  /config

root/etc/s6-overlay/s6-rc.d/init-wireguard-confs/type

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-wireguard-confs/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-wireguard-confs/run

root/etc/s6-overlay/s6-rc.d/init-wireguard-module/run

@@ -30,31 +30,39 @@ if [ "$SKIP_COMPILE" != "true" ] && [ ! -e /lib/modules/$(uname -r)/build ]; the
     apt-get install -y \
       raspberrypi-kernel-headers
   elif uname -v | grep -q 'Ubuntu'; then
-    echo "**** Ubuntu kernel detected, but likely not Focal. ****"
-    echo "**** Attempting to install kernel headers from Ubuntu Bionic repo ****"
+    echo "**** Ubuntu kernel detected, but likely not Jammy. ****"
+    echo "**** Attempting to install kernel headers from Ubuntu Focal repo ****"
     if uname -m | grep -q 'x86_64'; then
       echo -e \
-        "deb http://archive.ubuntu.com/ubuntu/ bionic main restricted\ndeb-src http://archive.ubuntu.com/ubuntu/ bionic main restricted\n\ndeb http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted\ndeb-src http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted" \
-        > /etc/apt/sources.list.d/xenial-bionic.list
+        "deb http://archive.ubuntu.com/ubuntu/ focal main restricted\ndeb-src http://archive.ubuntu.com/ubuntu/ focal main restricted\n\ndeb http://archive.ubuntu.com/ubuntu/ focal-updates main restricted\ndeb-src http://archive.ubuntu.com/ubuntu/ focal-updates main restricted" \
+        > /etc/apt/sources.list.d/xenial-bionic-focal.list
     else
       echo -e \
-      "deb http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted\ndeb-src http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted\n\ndeb http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted\ndeb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted" \
-        > /etc/apt/sources.list.d/xenial-bionic.list
+      "deb http://ports.ubuntu.com/ubuntu-ports/ focal main restricted\ndeb-src http://ports.ubuntu.com/ubuntu-ports/ focal main restricted\n\ndeb http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted\ndeb-src http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted" \
+        > /etc/apt/sources.list.d/xenial-bionic-focal.list
     fi
     apt-get update
     if apt-cache show linux-headers-$(uname -r) 2&>1 >/dev/null; then
       apt-get install -y \
         linux-headers-$(uname -r)
     else
-      echo "**** No kernel headers found in the Ubuntu Bionic repo!! Trying Ubuntu Xenial. ****"
-      sed -i 's/bionic/xenial/g' /etc/apt/sources.list.d/xenial-bionic.list
+      echo "**** No kernel headers found in the Ubuntu Focal repo!! Trying Ubuntu Bionic. ****"
+      sed -i 's/focal/bionic/g' /etc/apt/sources.list.d/xenial-bionic-focal.list
       apt-get update
       if apt-cache show linux-headers-$(uname -r) 2&>1 >/dev/null; then
         apt-get install -y \
           linux-headers-$(uname -r)
       else
-        echo "**** No kernel headers found in the Ubuntu repos!! Will try the headers from host (if mapped), may or may not work ****"
-        rm -rf /etc/apt/sources.list.d/xenial-bionic.list
+        echo "**** No kernel headers found in the Ubuntu Bionic repo!! Trying Ubuntu Xenial. ****"
+        sed -i 's/bionic/xenial/g' /etc/apt/sources.list.d/xenial-bionic-focal.list
+        apt-get update
+        if apt-cache show linux-headers-$(uname -r) 2&>1 >/dev/null; then
+          apt-get install -y \
+            linux-headers-$(uname -r)
+        else
+          echo "**** No kernel headers found in the Ubuntu repos!! Will try the headers from host (if mapped), may or may not work ****"
+          rm -rf /etc/apt/sources.list.d/xenial-bionic-focal.list
+        fi
       fi
     fi
   elif uname -v | grep -q 'Debian'; then
@@ -150,4 +158,3 @@ DUDE
     sleep infinity
   fi
 fi
-

root/etc/s6-overlay/s6-rc.d/init-wireguard-module/type

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-wireguard-module/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-wireguard-module/run

root/etc/s6-overlay/s6-rc.d/svc-coredns/notification-fd

@@ -0,0 +1 @@
+3

root/etc/s6-overlay/s6-rc.d/svc-coredns/run

@@ -1,11 +1,11 @@
 #!/usr/bin/with-contenv bash
 
-cd /config/coredns
-
 if netstat -apn | grep -q ":53 "; then
   echo "Another service is using port 53, disabling CoreDNS"
   sleep infinity
 else
   exec \
-    /app/coredns -dns.port=53
-fi
+    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z -u 127.0.0.1 53" \
+        cd /config/coredns \
+        /app/coredns -dns.port=53
+fi

root/etc/s6-overlay/s6-rc.d/svc-coredns/type

@@ -0,0 +1 @@
+longrun

root/etc/s6-overlay/s6-rc.d/svc-wireguard/type

@@ -0,0 +1 @@
+longrun