Merge pull request #142 from linuxserver/3.18-develop

Rebase to 3.18 (develop)
linuxserver · Jul 10, 2023 · c91bc07 · c91bc07
2 parents 3c44b30 + 67aa013
commit c91bc07
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 3 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
@@ -240,6 +240,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **11.07.23:** - Rebase to Alpine 3.18.
 * **01.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)
 * **13.02.23:** - Add icu-data-full to address [ICU issue](https://github.com/Jackett/Jackett/issues/14008) with Cyrillic character sets.
 * **11.02.23:** - Rebase to Alpine 3.17, migrate to s6v3.

diff --git a/readme-vars.yml b/readme-vars.yml
@@ -49,6 +49,7 @@ app_setup_block: |
  More info at [{{ project_name|capitalize }}]({{ project_url }}).
 # changelog
 changelogs:
+ - {date: "11.07.23:", desc: "Rebase 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: "13.02.23:", desc: "Add icu-data-full to address [ICU issue](https://github.com/Jackett/Jackett/issues/14008) with Cyrillic character sets."}
  - {date: "11.02.23:", desc: "Rebase to Alpine 3.17, migrate to s6v3."}

diff --git a/root/etc/s6-overlay/s6-rc.d/svc-jackett/run b/root/etc/s6-overlay/s6-rc.d/svc-jackett/run
@@ -7,7 +7,6 @@ else
  COMMAND="/app/Jackett/jackett --NoUpdates"
 fi
 
-
 exec \
  s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 9117" \
  s6-setuidgid abc ${COMMAND} ${RUN_OPTS}