Merge pull request #41 from linuxserver/s6v3

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.13
+FROM ghcr.io/linuxserver/baseimage-alpine:3.16
 
 # set version label
 ARG BUILD_DATE
@@ -10,7 +10,6 @@ LABEL maintainer="sparklyballs"
 RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --virtual=build-dependencies \
-	curl \
     unzip && \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
@@ -37,4 +36,5 @@ COPY root/ /
 
 # ports and volumes
 EXPOSE 2202 2203
-VOLUME /books /comics /config /files
+
+VOLUME /config

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.13
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16
 
 # set version label
 ARG BUILD_DATE
@@ -10,7 +10,6 @@ LABEL maintainer="sparklyballs"
 RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --virtual=build-dependencies \
-	curl \
     unzip && \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
@@ -37,4 +36,5 @@ COPY root/ /
 
 # ports and volumes
 EXPOSE 2202 2203
-VOLUME /books /comics /config /files
+
+VOLUME /config

Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.13
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16
 
 # set version label
 ARG BUILD_DATE
@@ -10,7 +10,6 @@ LABEL maintainer="sparklyballs"
 RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --virtual=build-dependencies \
-	curl \
     unzip && \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
@@ -37,4 +36,5 @@ COPY root/ /
 
 # ports and volumes
 EXPOSE 2202 2203
-VOLUME /books /comics /config /files
+
+VOLUME /config

README.md

@@ -251,6 +251,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **10.10.22:** - Rebasing to alpine 3.16, migrate to s6v3.
 * **23.01.21:** - Rebasing to alpine 3.13.
 * **01.06.20:** - Rebasing to alpine 3.12.
 * **19.12.19:** - Rebasing to alpine 3.11.

readme-vars.yml

@@ -68,6 +68,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "10.10.22:", desc: "Rebasing to alpine 3.16, migrate to s6v3." }
   - { date: "23.01.21:", desc: "Rebasing to alpine 3.13." }
   - { date: "01.06.20:", desc: "Rebasing to alpine 3.12." }
   - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }

root/etc/cont-init.d/30-config

@@ -1,14 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-# make our folders
-mkdir -p \
-	config/fonts
-
-# copy config
-[[ ! -e /config/preferences.json ]] && \
-	cp /defaults/preferences.json /config/preferences.json
-
-# permissions
-chown -R abc:abc \
-	/config \
-	/app/ubooquity

root/etc/s6-overlay/s6-rc.d/init-ubooquity-config/run

@@ -0,0 +1,15 @@
+#!/usr/bin/with-contenv bash
+
+# make our folders
+mkdir -p \
+    config/fonts
+
+# copy config
+if [[ ! -f /config/preferences.json ]]; then
+    cp /defaults/preferences.json /config/preferences.json
+fi
+
+# permissions
+chown -R abc:abc \
+    /config \
+    /app/ubooquity

root/etc/s6-overlay/s6-rc.d/init-ubooquity-config/type

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-ubooquity-config/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-ubooquity-config/run

root/etc/s6-overlay/s6-rc.d/svc-ubooquity/notification-fd

@@ -0,0 +1 @@
+3

root/etc/s6-overlay/s6-rc.d/svc-ubooquity/run

@@ -0,0 +1,10 @@
+#!/usr/bin/with-contenv bash
+
+JAVAMEM=${MAXMEM:-512}
+
+exec \
+    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 2203" \
+        cd /app/ubooquity s6-setuidgid abc java -Xmx"$JAVAMEM"m \
+        -jar /app/ubooquity/Ubooquity.jar \
+        --headless --host 0.0.0.0 --remoteadmin \
+        --workdir /config

root/etc/s6-overlay/s6-rc.d/svc-ubooquity/type

@@ -0,0 +1 @@
+longrun

root/etc/services.d/ubooquity/run

@@ -1,11 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-JAVAMEM=${MAXMEM:-512}
-
-cd /app/ubooquity || exit
-
-exec \
-	s6-setuidgid abc java -Xmx"$JAVAMEM"m \
-	-jar /app/ubooquity/Ubooquity.jar \
-	--headless --host 0.0.0.0 --remoteadmin \
-	--workdir /config