Merge pull request #80 from linuxserver/s6v3-nightly

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.15
+FROM ghcr.io/linuxserver/baseimage-alpine:3.16
 
 # set version label
 ARG BUILD_DATE
@@ -14,8 +14,6 @@ ENV XDG_CONFIG_HOME="/config/xdg"
 RUN \
   echo "**** install packages ****" && \
   apk add -U --upgrade --no-cache \
-    curl \
-    jq \
     chromaprint \
     icu-libs \
     sqlite-libs && \
@@ -43,4 +41,5 @@ COPY root/ /
 
 # ports and volumes
 EXPOSE 8686
+
 VOLUME /config

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16
 
 # set version label
 ARG BUILD_DATE
@@ -14,8 +14,6 @@ ENV XDG_CONFIG_HOME="/config/xdg"
 RUN \
   echo "**** install packages ****" && \
   apk add -U --upgrade --no-cache \
-    curl \
-    jq \
     chromaprint \
     icu-libs \
     sqlite-libs && \
@@ -43,4 +41,5 @@ COPY root/ /
 
 # ports and volumes
 EXPOSE 8686
+
 VOLUME /config

Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.15
+FROM ghcr.io/linuxserver/baseimage-alpine:3.16
 
 # set version label
 ARG BUILD_DATE
@@ -14,8 +14,6 @@ ENV XDG_CONFIG_HOME="/config/xdg"
 RUN \
   echo "**** install packages ****" && \
   apk add -U --upgrade --no-cache \
-    curl \
-    jq \
     chromaprint \
     icu-libs \
     sqlite-libs && \
@@ -43,4 +41,5 @@ COPY root/ /
 
 # ports and volumes
 EXPOSE 8686
+
 VOLUME /config

README.md

@@ -65,6 +65,7 @@ This image provides various versions that are available via tags. Please read th
 | Tag | Available | Description |
 | :----: | :----: |--- |
 | latest | ✅ | Stable Lidarr releases. |
+| develop | ✅ | Develop Lidarr Releases. |
 | nightly | ✅ | Nightly Lidarr Releases. |
 
 ## Application Setup
@@ -248,6 +249,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **27.10.22:** - Rebase nightly Alpine 3.16, migrate to s6v3.
 * **04.02.22:** - Rebase nightly branch to Alpine.
 * **30.12.21:** - Add nightly-alpine branch.
 * **01.08.21:** - Add libchromaprint-tools.

jenkins-vars.yml

@@ -23,6 +23,6 @@ repo_vars:
   - CI_DELAY='120'
   - CI_DOCKERENV='TZ=US/Pacific'
   - CI_AUTH='user:password'
-  - CI_WEBPATH=''
+  - CI_WEBPATH='/system/status'
 sponsor_links:
   - { name: "Lidarr", url: "https://opencollective.com/lidarr" }

readme-vars.yml

@@ -17,6 +17,7 @@ available_architectures:
 development_versions: true
 development_versions_items:
   - { tag: "latest", desc: "Stable Lidarr releases." }
+  - { tag: "develop", desc: "Develop Lidarr Releases." }
   - { tag: "nightly", desc: "Nightly Lidarr Releases." }
 
 # container parameters
@@ -58,6 +59,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "27.10.22:", desc: "Rebase nightly to Alpine 3.16, migrate to s6v3." }
   - { date: "04.02.22:", desc: "Rebase nightly branch to Alpine." }
   - { date: "30.12.21:", desc: "Add nightly-alpine branch." }
   - { date: "01.08.21:", desc: "Add libchromaprint-tools." }

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

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

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

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

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

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

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

@@ -0,0 +1,6 @@
+#!/usr/bin/with-contenv bash
+
+exec \
+    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8686" \
+        cd /app/lidarr/bin s6-setuidgid abc /app/lidarr/bin/Lidarr \
+        -nobrowser -data=/config

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

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

root/etc/services.d/lidarr/run

@@ -1,10 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-if [ -n "${UMASK_SET}" ] && [ -z "${UMASK}" ]; then
-    echo -e "You are using a legacy method of defining umask\nplease update your environment variable from UMASK_SET to UMASK\nto keep the functionality after July 2021"
-    umask ${UMASK_SET}
-fi
-
-exec \
-    s6-setuidgid abc /app/lidarr/bin/Lidarr \
-    -nobrowser -data=/config