Merge pull request #236 from linuxserver/s6v3-v4

2022-10-29 05:46:51 +01:00
parent a39f0fae9d d71c445ab5
commit af873f16f2
23 changed files with 23 additions and 27 deletions
@@ -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 \
    icu-libs \
    sqlite-libs && \
  echo "**** install sonarr ****" && \
@@ -41,4 +39,5 @@ COPY root/ /

 # ports and volumes
 EXPOSE 8989
+
 VOLUME /config
@@ -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 \
    icu-libs \
    sqlite-libs && \
  echo "**** install sonarr ****" && \
@@ -41,4 +39,5 @@ COPY root/ /

 # ports and volumes
 EXPOSE 8989
+
 VOLUME /config
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16

 # set version label
 ARG BUILD_DATE
@@ -12,4 +12,5 @@ COPY root-armhf/ /

 # ports and volumes
 EXPOSE 8989
+
 VOLUME /config
@@ -237,7 +237,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

 ## Versions

-* **18.09.22:** - Rebase develop to Alpine and bump to v4.
+* **27.10.22:** - Rebase v4 to Alpine 3.16, migrate to s6v3.
 * **03.08.22:** - Deprecate armhf.
 * **02.08.22:** - Rebase develop branch to Ubuntu Focal due to dropping of mono support on Alpine.
 * **20.02.22:** - Rebase develop branch to Alpine.
@@ -44,7 +44,7 @@ app_setup_block: |

 # changelog
 changelogs:
-  - { date: "18.09.22:", desc: "Rebase develop to Alpine and bump to v4." }
+  - { date: "27.10.22:", desc: "Rebase v4 to Alpine 3.16, migrate to s6v3." }
  - { date: "03.08.22:", desc: "Deprecate armhf." }
  - { date: "02.08.22:", desc: "Rebase develop branch to Ubuntu Focal due to dropping of mono support on Alpine." }
  - { date: "20.02.22:", desc: "Rebase develop branch to Alpine." }
@@ -5,8 +5,8 @@ cat <<-EOF
    ********************************************************
    *                                                      *
    *                         !!!!                         *
-    *            This image no longers supports            *
-    *    32 bit ARM due to a lack of upstream packages     *
+    *          This Sonarr image does not support          *
+    *   32 bit ARM due to lack of available OS packages    *
    *                                                      *
    *                                                      *
    ********************************************************
@@ -0,0 +1 @@
+oneshot
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-sonarr-config/run
@@ -1,8 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-if [[ -n $ISCI ]]; then
-    sleep 180
-fi
-
-exec \
-    s6-svscanctl -t /run/service/
@@ -2,4 +2,4 @@

 # permissions
 chown -R abc:abc \
-    /app/sonarr/bin
+    /config
@@ -0,0 +1 @@
+oneshot
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-sonarr-config/run
@@ -0,0 +1 @@
+3
@@ -0,0 +1,6 @@
+#!/usr/bin/with-contenv bash
+
+exec \
+    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8989" \
+        cd /app/sonarr/bin s6-setuidgid abc /app/sonarr/bin/Sonarr \
+        -nobrowser -data=/config
@@ -0,0 +1 @@
+longrun
@@ -1,7 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-cd /app/sonarr/bin || exit
-
-exec \
-    s6-setuidgid abc /app/sonarr/bin/Sonarr \
-    -nobrowser -data=/config
				`@@ -0,0 +1 @@`
				`/etc/s6-overlay/s6-rc.d/init-sonarr-config/run`