Merge pull request #28 from linuxserver/3.18

linuxserver · Aug 28, 2023 · a3dfb07 · a3dfb07
2 parents 81e463a + 705a843
commit a3dfb07
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 11 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.16
+FROM ghcr.io/linuxserver/baseimage-alpine:3.18
 
 # set version label
 ARG BUILD_DATE
@@ -37,13 +37,11 @@ RUN \
     /app/wiki/ && \
   cd /app/wiki && \
   npm rebuild sqlite3 && \
-  echo "**** Fix system info page ****" && \
-  touch /etc/os-release && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \
   rm -rf \
-    /root/.cache \
+    $HOME/.cache \
     /tmp/*
 
 # copy local files

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18
 
 # set version label
 ARG BUILD_DATE
@@ -37,13 +37,11 @@ RUN \
     /app/wiki/ && \
   cd /app/wiki && \
   npm rebuild sqlite3 && \
-  echo "**** Fix system info page ****" && \
-  touch /etc/os-release && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \
   rm -rf \
-    /root/.cache \
+    $HOME/.cache \
     /tmp/*
 
 # copy local files

diff --git a/README.md b/README.md
@@ -245,6 +245,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **25.08.22:** - Rebase to Alpine 3.18.
 * **07.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)
 * **21.03.23:** - Restore git and openssh packages for git storage support.
 * **21.03.23:** - Create dummy /etc/os-release to fix System Info page.

diff --git a/readme-vars.yml b/readme-vars.yml
@@ -42,6 +42,7 @@ app_setup_block: |
   For more information please see the [official documentation](https://docs.requarks.io/).
 # changelog
 changelogs:
+  - {date: "25.08.22:", desc: "Rebase to Alpine 3.18."}
   - {date: "07.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}
   - {date: "21.03.23:", desc: "Restore git and openssh packages for git storage support."}
   - {date: "21.03.23:", desc: "Create dummy /etc/os-release to fix System Info page."}

diff --git a/root/etc/s6-overlay/s6-rc.d/init-wikijs-config/type b/root/etc/s6-overlay/s6-rc.d/init-wikijs-config/type
@@ -1 +1 @@
-oneshot
+oneshot
diff --git a/root/etc/s6-overlay/s6-rc.d/init-wikijs-config/up b/root/etc/s6-overlay/s6-rc.d/init-wikijs-config/up
@@ -1 +1 @@
-/etc/s6-overlay/s6-rc.d/init-wikijs-config/run
+/etc/s6-overlay/s6-rc.d/init-wikijs-config/run
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-wikijs/type b/root/etc/s6-overlay/s6-rc.d/svc-wikijs/type
@@ -1 +1 @@
-longrun
+longrun
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		/etc/s6-overlay/s6-rc.d/init-wikijs-config/run
		/etc/s6-overlay/s6-rc.d/init-wikijs-config/run