From b5356efd8782e41dab8855aee34af23df92e9b99 Mon Sep 17 00:00:00 2001
From: driz <40674481+drizuid@users.noreply.github.com>
Date: Fri, 17 Nov 2023 11:02:21 -0500
Subject: [PATCH] rebase 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 e53b620..0144740 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 3e58a55..a959af7 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 eb81fb2..b95cb6c 100644
--- a/README.md
+++ b/README.md
@@ -358,6 +358,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **17.11.23:** - Rebase tftp branch to Alpine 3.18.
 * **01.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)
 * **05.03.23:** - Rebase tftp branch to Alpine 3.17.
 * **14.10.22:** - Rebasing tftp branch to Alpine 3.16, migrate to s6v3.
diff --git a/readme-vars.yml b/readme-vars.yml
index 7bdd007..e57f92e 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -128,6 +128,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - {date: "17.11.23:", desc: "Rebase tftp branch to Alpine 3.18."}
   - {date: "01.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}
   - {date: "05.03.23:", desc: "Rebase tftp branch to Alpine 3.17."}
   - {date: "14.10.22:", desc: "Rebasing tftp branch to Alpine 3.16, migrate to s6v3."}