From c96c8d8eb9a776dba8fa47c46cdbe1c1b4168cfc Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Tue, 27 Jun 2023 22:11:36 +0100
Subject: [PATCH 1/2] Rebase back to 3.18

---
 Dockerfile         | 2 +-
 Dockerfile.aarch64 | 2 +-
 README.md          | 1 +
 readme-vars.yml    | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f6a95f4..1f45cad 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.17
+FROM ghcr.io/linuxserver/baseimage-alpine:3.18
 
 # set version label
 ARG BUILD_DATE
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 0f03e47..9f478d8 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18
 
 # set version label
 ARG BUILD_DATE
diff --git a/README.md b/README.md
index 46021d5..7752783 100644
--- a/README.md
+++ b/README.md
@@ -330,6 +330,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **28.06.23:** - Rebase master to Alpine 3.18 again.
 * **26.06.23:** - Revert master to Alpine 3.17, due to issue with openresolv.
 * **24.06.23:** - Rebase master to Alpine 3.18, deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf).
 * **26.04.23:** - Rework branches. Swap alpine and ubuntu builds.
diff --git a/readme-vars.yml b/readme-vars.yml
index 671934d..60e772c 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -126,6 +126,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "28.06.23:", desc: "Rebase master to Alpine 3.18 again." }
   - { date: "26.06.23:", desc: "Revert master to Alpine 3.17, due to issue with openresolv." }
   - { date: "24.06.23:", desc: "Rebase master to Alpine 3.18, deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf)." }
   - { date: "26.04.23:", desc: "Rework branches. Swap alpine and ubuntu builds." }

From 2d5c9c44f84a357a6d47740b7b9e0f230e95db42 Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Fri, 28 Jul 2023 21:03:38 +0100
Subject: [PATCH 2/2] If user sets USE_COREDNS honour their values even if it
 breaks things

---
 root/etc/s6-overlay/s6-rc.d/init-wireguard-confs/run | 2 +-
 root/etc/s6-overlay/s6-rc.d/svc-coredns/run          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/root/etc/s6-overlay/s6-rc.d/init-wireguard-confs/run b/root/etc/s6-overlay/s6-rc.d/init-wireguard-confs/run
index 98bcf5a..36bb2aa 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-wireguard-confs/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-wireguard-confs/run
@@ -184,7 +184,7 @@ else
         echo "**** No client conf found. Provide your own client conf as \"/config/wg0.conf\" and restart the container. ****"
         sleep infinity
     fi
-    printf %s "${USE_COREDNS:-false}" > /run/s6/container_environment/USE_COREDNS
+    printf %s "${USE_COREDNS,,:-false}" > /run/s6/container_environment/USE_COREDNS
 fi
 
 # set up CoreDNS
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-coredns/run b/root/etc/s6-overlay/s6-rc.d/svc-coredns/run
index a35e7fa..f9a478c 100755
--- a/root/etc/s6-overlay/s6-rc.d/svc-coredns/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-coredns/run
@@ -1,7 +1,7 @@
 #!/usr/bin/with-contenv bash
 # shellcheck shell=bash
 
-if netstat -apn | grep -q ":53 "; then
+if netstat -apn | grep -q ":53 " && [[ -z "${USE_COREDNS}" ]]; then
     USE_COREDNS="false"
 fi