corrections for building sonarr on debian stretch

build/config

@@ -1,7 +1,7 @@
 export LC_ALL=C
 export DEBIAN_FRONTEND=noninteractive
 
-apt_install='apt-get install -y --no-install-recommends --force-yes'
+apt_install='apt-get install -y --no-install-recommends'
 
 apt_install_permanent() {
     echo $@ | tr ' ' '\n' >> /build/permanent

build/scripts/multimedia.sh

@@ -1,6 +1,6 @@
 ## Enable multimedia sources in APT
-echo 'deb http://www.deb-multimedia.org jessie main non-free' >> /etc/apt/sources.list
-echo 'deb-src http://www.deb-multimedia.org jessie main non-free' >> /etc/apt/sources.list
+echo 'deb http://www.deb-multimedia.org stretch main non-free' >> /etc/apt/sources.list
+echo 'deb-src http://www.deb-multimedia.org stretch main non-free' >> /etc/apt/sources.list
 apt update
 apt_install_permanent deb-multimedia-keyring
 apt update

build/scripts/prepare.sh

@@ -15,9 +15,9 @@ echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/02apt-speedup
 export_env INITRD no
 
 # Enable sources and backports in APT
-echo 'deb-src http://httpredir.debian.org/debian/ jessie main' >> /etc/apt/sources.list
-echo 'deb http://httpredir.debian.org/debian/ jessie-backports main contrib non-free' >> /etc/apt/sources.list
-echo 'deb-src http://httpredir.debian.org/debian/ jessie-backports main contrib non-free' >> /etc/apt/sources.list
+echo 'deb-src http://httpredir.debian.org/debian/ stretch main' >> /etc/apt/sources.list
+echo 'deb http://httpredir.debian.org/debian/ stretch-backports main contrib non-free' >> /etc/apt/sources.list
+echo 'deb-src http://httpredir.debian.org/debian/ stretch-backports main contrib non-free' >> /etc/apt/sources.list
 apt update
 
 ## Fix some issues with APT packages
@@ -36,12 +36,10 @@ ln -sf /bin/true /usr/bin/ischroot
 # https://github.com/docker/docker/issues/6345#issuecomment-49245365
 ln -sf /bin/true /usr/bin/chfn
 
-## Install HTTPS support for APT
-apt update
-apt_install_permanent apt-transport-https
+## Package management
+apt_install_permanent apt-transport-https apt-utils
 
 ## Upgrade all packages
-apt update
 apt dist-upgrade -y --no-install-recommends
 
 ## Set timezone

build/scripts/sonarr.sh

@@ -4,8 +4,10 @@ export_env SONARR_DATA /host/var/lib/sonarr
 ## Dependencies
 apt_install_permanent libmono-cil-dev sqlite3 mediainfo
 
-## Sonarr
+## Key
 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys FDA5DFFC
+
+## Sonarr
 echo "deb http://apt.sonarr.tv/ develop main" | tee -a /etc/apt/sources.list
 apt update
 apt_install_permanent nzbdrone

build/scripts/utilities.sh

@@ -1,5 +1,5 @@
 ## Often used tools
-apt_install_permanent software-properties-common psmisc wget curl python-pip git gawk zip gperf unzip bzip2 inetutils-ping inetutils-telnet rsync
+apt_install_permanent software-properties-common gnupg2 dirmngr psmisc wget curl python-pip git gawk zip gperf unzip bzip2 inetutils-ping inetutils-telnet rsync
 
 ## Often used python modules
 pip install argparse