From 9b9bc9e3550145db0976fe55c3264319f7bc7e0e Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Tue, 30 May 2023 16:14:29 +0100
Subject: [PATCH] Rebase to 3.18

---
 Dockerfile                                   | 2 +-
 Dockerfile.aarch64                           | 2 +-
 README.md                                    | 1 +
 readme-vars.yml                              | 1 +
 root/etc/s6-overlay/s6-rc.d/svc-pairdrop/run | 2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 122a973..867528e 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 8f56269..38fdfa2 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 c018127..316de60 100644
--- a/README.md
+++ b/README.md
@@ -246,5 +246,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **30.05.23:** - Rebase to Alpine 3.18.
 * **06.03.23:** - Run npm install as non-root user.
 * **20.02.23:** - Initial Release.
diff --git a/readme-vars.yml b/readme-vars.yml
index 8d2c299..a398779 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -63,5 +63,6 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "30.05.23:", desc: "Rebase to Alpine 3.18." }
   - { date: "06.03.23:", desc: "Run npm install as non-root user." }
   - { date: "20.02.23:", desc: "Initial Release." }
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-pairdrop/run b/root/etc/s6-overlay/s6-rc.d/svc-pairdrop/run
index c22d2f9..7fa7c2e 100755
--- a/root/etc/s6-overlay/s6-rc.d/svc-pairdrop/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-pairdrop/run
@@ -11,4 +11,4 @@ fi
 
 HOME=/config exec \
     s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 3000" \
-        cd /app/pairdrop s6-setuidgid abc npm start -- "${OPT_RATE_LIMIT}" "${OPT_WS_FALLBACK}"
+    cd /app/pairdrop s6-setuidgid abc npm start -- "${OPT_RATE_LIMIT}" "${OPT_WS_FALLBACK}"