Merge pull request #84 from linuxserver/develop-3.17

.github/workflows/call_invalid_helper.yml

@@ -0,0 +1,12 @@
+name: Comment on invalid interaction
+on:
+  issues:
+    types:
+      - labeled
+jobs:
+  add-comment-on-invalid:
+    if: github.event.label.name == 'invalid'
+    permissions:
+      issues: write
+    uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1
+    secrets: inherit

Dockerfile

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.15
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:3.17
 
 # set version label
 ARG BUILD_DATE
@@ -14,8 +16,6 @@ ENV XDG_CONFIG_HOME="/config/xdg"
 RUN \
   echo "**** install packages ****" && \
   apk add -U --upgrade --no-cache \
-    curl \
-    jq \
     chromaprint \
     icu-libs \
     sqlite-libs && \
@@ -35,12 +35,12 @@ RUN \
   echo "**** cleanup ****" && \
   rm -rf \
     /app/lidarr/bin/Lidarr.Update \
-    /tmp/* \
-    /var/tmp/*
+    /tmp/*
 
 # copy local files
 COPY root/ /
 
 # ports and volumes
 EXPOSE 8686
+
 VOLUME /config

Dockerfile.aarch64

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -14,8 +16,6 @@ ENV XDG_CONFIG_HOME="/config/xdg"
 RUN \
   echo "**** install packages ****" && \
   apk add -U --upgrade --no-cache \
-    curl \
-    jq \
     chromaprint \
     icu-libs \
     sqlite-libs && \
@@ -35,12 +35,12 @@ RUN \
   echo "**** cleanup ****" && \
   rm -rf \
     /app/lidarr/bin/Lidarr.Update \
-    /tmp/* \
-    /var/tmp/*
+    /tmp/*
 
 # copy local files
 COPY root/ /
 
 # ports and volumes
 EXPOSE 8686
+
 VOLUME /config

Dockerfile.armhf

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -14,8 +16,6 @@ ENV XDG_CONFIG_HOME="/config/xdg"
 RUN \
   echo "**** install packages ****" && \
   apk add -U --upgrade --no-cache \
-    curl \
-    jq \
     chromaprint \
     icu-libs \
     sqlite-libs && \
@@ -35,12 +35,12 @@ RUN \
   echo "**** cleanup ****" && \
   rm -rf \
     /app/lidarr/bin/Lidarr.Update \
-    /tmp/* \
-    /var/tmp/*
+    /tmp/*
 
 # copy local files
 COPY root/ /
 
 # ports and volumes
 EXPOSE 8686
+
 VOLUME /config

Jenkinsfile

@@ -33,7 +33,7 @@ pipeline {
     CI_DELAY='120'
     CI_DOCKERENV='TZ=US/Pacific'
     CI_AUTH='user:password'
-    CI_WEBPATH=''
+    CI_WEBPATH='/system/status'
   }
   stages {
     // Setup all the basic environment variables needed for the build

README.md

@@ -249,6 +249,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **06.05.22:** - Rebase develop branch to Alpine 3.17, migrate to s6v3.
 * **06.05.22:** - Rebase develop branch to Alpine.
 * **01.08.21:** - Add libchromaprint-tools.
 * **11.07.21:** - Make the paths clearer to the user.

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

@@ -59,6 +59,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "06.05.22:", desc: "Rebase develop branch to Alpine 3.17, migrate to s6v3." }
   - { date: "06.05.22:", desc: "Rebase develop branch to Alpine." }
   - { date: "01.08.21:", desc: "Add libchromaprint-tools." }
   - { date: "11.07.21:", desc: "Make the paths clearer to the user." }

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

@@ -1,5 +1,6 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 # permissions
-chown -R abc:abc \
+lsiown -R abc:abc \
     /config

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,7 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=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,5 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-exec \
-    s6-setuidgid abc /app/lidarr/bin/Lidarr \
-    -nobrowser -data=/config