Rebase to Jammy

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-mono:focal
+FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy
 
 # set version label
 ARG BUILD_DATE
@@ -20,12 +20,15 @@ RUN \
     "https://mediaarea.net/repo/deb/repo-mediaarea_1.0-12_all.deb" \
     -o /tmp/key.deb && \
   dpkg -i /tmp/key.deb && \
-  echo "deb https://mediaarea.net/repo/deb/ubuntu focal main" | tee /etc/apt/sources.list.d/mediaarea.list && \
+  echo "deb https://mediaarea.net/repo/deb/ubuntu jammy main" | tee /etc/apt/sources.list.d/mediaarea.list && \
+  echo "**** add mono repository ****" && \
+  apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \
+  echo "deb http://download.mono-project.com/repo/ubuntu stable-focal main" | tee /etc/apt/sources.list.d/mono-official.list && \
   echo "**** install packages ****" && \
   apt-get update && \
-  apt-get install -y \
-    jq \
-    mediainfo \
+  apt-get install -y --no-install-recommends \
+    ca-certificates-mono \
+    libcurl4-openssl-dev \
     libmono-system-net-http4.0-cil \
     libmono-corlib4.5-cil \
     libmono-microsoft-csharp4.0-cil \
@@ -47,7 +50,10 @@ RUN \
     libmono-system-web4.0-cil \
     libmono-system-xml-linq4.0-cil \
     libmono-system-xml4.0-cil \
-    libmono-system4.0-cil && \    
+    libmono-system4.0-cil \
+    mono-runtime \
+    mono-vbnc \
+    mediainfo && \    
   echo "**** install sonarr ****" && \
   mkdir -p /app/sonarr/bin && \
   if [ -z ${SONARR_VERSION+x} ]; then \
@@ -66,6 +72,7 @@ RUN \
   apt-get clean && \
   rm -rf \
     /tmp/* \
+    /var/lib/apt/lists/* \
     /var/tmp/*
 
 # add local files

Dockerfile.aarch64

@@ -20,12 +20,15 @@ RUN \
     "https://mediaarea.net/repo/deb/repo-mediaarea_1.0-12_all.deb" \
     -o /tmp/key.deb && \
   dpkg -i /tmp/key.deb && \
-  echo "deb https://mediaarea.net/repo/deb/ubuntu focal main" | tee /etc/apt/sources.list.d/mediaarea.list && \
+  echo "deb https://mediaarea.net/repo/deb/ubuntu jammy main" | tee /etc/apt/sources.list.d/mediaarea.list && \
+  echo "**** add mono repository ****" && \
+  apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \
+  echo "deb http://download.mono-project.com/repo/ubuntu stable-focal main" | tee /etc/apt/sources.list.d/mono-official.list && \
   echo "**** install packages ****" && \
   apt-get update && \
-  apt-get install -y \
-    jq \
-    mediainfo \
+  apt-get install -y --no-install-recommends \
+    ca-certificates-mono \
+    libcurl4-openssl-dev \
     libmono-system-net-http4.0-cil \
     libmono-corlib4.5-cil \
     libmono-microsoft-csharp4.0-cil \
@@ -47,7 +50,10 @@ RUN \
     libmono-system-web4.0-cil \
     libmono-system-xml-linq4.0-cil \
     libmono-system-xml4.0-cil \
-    libmono-system4.0-cil && \    
+    libmono-system4.0-cil \
+    mono-runtime \
+    mono-vbnc \
+    mediainfo && \    
   echo "**** install sonarr ****" && \
   mkdir -p /app/sonarr/bin && \
   if [ -z ${SONARR_VERSION+x} ]; then \
@@ -66,11 +72,12 @@ RUN \
   apt-get clean && \
   rm -rf \
     /tmp/* \
+    /var/lib/apt/lists/* \
     /var/tmp/*
 
-# add local files
+# add local files
 COPY root/ /
 
-# ports and volumes
+# ports and volumes
 EXPOSE 8989
 VOLUME /config

README.md

@@ -244,6 +244,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **15.02.23:** - Rebase master branch to Jammy.
+* **19.12.22:** - Rebase develop branch Alpine 3.17.
 * **24.11.22:** - Bump develop branch to v4, rebase to Alpine 3.16.
 * **03.08.22:** - Deprecate armhf.
 * **02.08.22:** - Add armhf deprecation warning.

readme-vars.yml

@@ -55,7 +55,9 @@ app_setup_block: |
 
 # changelog
 changelogs:
-  - { date: "24.11.22:", desc: "Bump develop branch to v4, rebase to Alpine 3.16." }  
+  - { date: "15.02.23:", desc: "Rebase master branch to Jammy." }
+  - { date: "19.12.22:", desc: "Rebase develop branch Alpine 3.17." }
+  - { date: "24.11.22:", desc: "Bump develop branch to v4, rebase to Alpine 3.16." }
   - { date: "03.08.22:", desc: "Deprecate armhf." }
   - { date: "02.08.22:", desc: "Add armhf deprecation warning." }
   - { date: "28.04.22:", desc: "Rebase master branch to mono 6.12 base (focal)." }

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

@@ -1,9 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-# cleanup pid if it exists
-[[ -e /config/sonarr.pid ]] && \
-    rm -rf /config/sonarr.pid
-
-# permissions
-chown -R abc:abc \
-    /app/sonarr/bin

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

@@ -0,0 +1,12 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+# cleanup pid if it exists
+if [[ -e /config/sonarr.pid ]]; then
+    rm -rf /config/sonarr.pid
+fi
+
+# permissions
+lsiown -R abc:abc \
+    /app/sonarr/bin \
+    /config

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

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

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

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

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

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

root/etc/s6-overlay/s6-rc.d/svc-sonarr/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 8989" \
+        cd /app/sonarr/bin s6-setuidgid abc mono --debug Sonarr.exe \
+        -nobrowser -data=/config

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

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

root/etc/services.d/sonarr/run

@@ -1,7 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-cd /app/sonarr/bin || exit
-
-exec \
-    s6-setuidgid abc mono --debug Sonarr.exe \
-    -nobrowser -data=/config