rebase to jammy, upgrade to s6v3

Author: aptalca

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-config-end/dependencies.d/init-wireguard-confs

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

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

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

root/etc/cont-init.d/40-confs renamed to root/etc/s6-overlay/s6-rc.d/init-wireguard-confs/run

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