Merge pull request #19 from linuxserver/3.18

Rebase to 3.18
linuxserver · Jul 10, 2023 · 57da003 · 57da003
2 parents 99eaed1 + 3dfa5dd
commit 57da003
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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
@@ -236,6 +236,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **10.07.23:** - Rebase to Alpine 3.18.
 * **25.12.22:** - Rebase to Alpine 3.17, migrate to s6v3, bump jre to 11, deprecate armhf.
 * **18.04.22:** - Rebase to Alpine 3.15.
 * **15.09.20:** - Initial Release.
diff --git a/readme-vars.yml b/readme-vars.yml
@@ -46,6 +46,7 @@ app_setup_block: "Whilst this is a more up to date rebase of the original Bookso
 
 # changelog
 changelogs:
+  - { date: "10.07.23:", desc: "Rebase to Alpine 3.18." }
   - { date: "25.12.22:", desc: "Rebase to Alpine 3.17, migrate to s6v3, bump jre to 11, deprecate armhf." }
   - { date: "18.04.22:", desc: "Rebase to Alpine 3.15." }
   - { date: "15.09.20:", desc: "Initial Release." }