From 66de2a887ba6aa2d9f3bc9a73eb02786def64735 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Tue, 2 Aug 2022 16:01:32 +0100 Subject: [PATCH 1/5] Rebase develop back to ubuntu due to Alpine dropping mono --- Dockerfile | 21 ++++++++++++++------- Dockerfile.aarch64 | 19 +++++++++++++------ Dockerfile.armhf | 19 +++++++++++++------ Jenkinsfile | 2 +- README.md | 1 + jenkins-vars.yml | 2 +- readme-vars.yml | 3 ++- root/etc/cont-init.d/30-config | 7 ------- root/etc/services.d/sonarr/run | 0 9 files changed, 45 insertions(+), 29 deletions(-) mode change 100644 => 100755 root/etc/services.d/sonarr/run diff --git a/Dockerfile b/Dockerfile index ec66167..15d77f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:3.15 +FROM ghcr.io/linuxserver/baseimage-mono:focal # set version label ARG BUILD_DATE @@ -8,18 +8,23 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="thespad" # set environment variables +ARG DEBIAN_FRONTEND="noninteractive" ENV XDG_CONFIG_HOME="/config/xdg" ENV SONARR_BRANCH="develop" RUN \ + echo "**** add mediaarea repository ****" && \ + curl -L \ + "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 "**** install packages ****" && \ - apk add -U --upgrade --no-cache \ + apt-get update && \ + apt-get install -y --no-install-recommends \ curl \ jq \ - libmediainfo \ - sqlite-libs && \ - apk add -U --upgrade --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \ - mono && \ + mediainfo && \ echo "**** install sonarr ****" && \ mkdir -p /app/sonarr/bin && \ if [ -z ${SONARR_VERSION+x} ]; then \ @@ -32,10 +37,12 @@ RUN \ tar xzf \ /tmp/sonarr.tar.gz -C \ /app/sonarr/bin --strip-components=1 && \ - echo -e "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)" > /app/sonarr/package_info && \ + echo "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)" > /app/sonarr/package_info && \ rm -rf /app/sonarr/bin/Sonarr.Update && \ echo "**** cleanup ****" && \ + apt-get clean && \ rm -rf \ + /var/lib/apt/lists/* \ /tmp/* \ /var/tmp/* diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index a19301d..c9d124e 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -8,18 +8,23 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="thespad" # set environment variables +ARG DEBIAN_FRONTEND="noninteractive" ENV XDG_CONFIG_HOME="/config/xdg" ENV SONARR_BRANCH="develop" RUN \ + echo "**** add mediaarea repository ****" && \ + curl -L \ + "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 "**** install packages ****" && \ - apk add -U --upgrade --no-cache \ + apt-get update && \ + apt-get install -y --no-install-recommends \ curl \ jq \ - libmediainfo \ - sqlite-libs && \ - apk add -U --upgrade --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \ - mono && \ + mediainfo && \ echo "**** install sonarr ****" && \ mkdir -p /app/sonarr/bin && \ if [ -z ${SONARR_VERSION+x} ]; then \ @@ -32,10 +37,12 @@ RUN \ tar xzf \ /tmp/sonarr.tar.gz -C \ /app/sonarr/bin --strip-components=1 && \ - echo -e "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)" > /app/sonarr/package_info && \ + echo "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)" > /app/sonarr/package_info && \ rm -rf /app/sonarr/bin/Sonarr.Update && \ echo "**** cleanup ****" && \ + apt-get clean && \ rm -rf \ + /var/lib/apt/lists/* \ /tmp/* \ /var/tmp/* diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 58865e8..5102bb9 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -8,18 +8,23 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="thespad" # set environment variables +ARG DEBIAN_FRONTEND="noninteractive" ENV XDG_CONFIG_HOME="/config/xdg" ENV SONARR_BRANCH="develop" RUN \ + echo "**** add mediaarea repository ****" && \ + curl -L \ + "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 "**** install packages ****" && \ - apk add -U --upgrade --no-cache \ + apt-get update && \ + apt-get install -y --no-install-recommends \ curl \ jq \ - libmediainfo \ - sqlite-libs && \ - apk add -U --upgrade --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \ - mono && \ + mediainfo && \ echo "**** install sonarr ****" && \ mkdir -p /app/sonarr/bin && \ if [ -z ${SONARR_VERSION+x} ]; then \ @@ -32,10 +37,12 @@ RUN \ tar xzf \ /tmp/sonarr.tar.gz -C \ /app/sonarr/bin --strip-components=1 && \ - echo -e "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)" > /app/sonarr/package_info && \ + echo "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)" > /app/sonarr/package_info && \ rm -rf /app/sonarr/bin/Sonarr.Update && \ echo "**** cleanup ****" && \ + apt-get clean && \ rm -rf \ + /var/lib/apt/lists/* \ /tmp/* \ /var/tmp/* diff --git a/Jenkinsfile b/Jenkinsfile index 1414193..5452f24 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,7 +24,7 @@ pipeline { DOCKERHUB_IMAGE = 'linuxserver/sonarr' DEV_DOCKERHUB_IMAGE = 'lsiodev/sonarr' PR_DOCKERHUB_IMAGE = 'lspipepr/sonarr' - DIST_IMAGE = 'alpine' + DIST_IMAGE = 'ubuntu' MULTIARCH='true' CI='true' CI_WEB='true' diff --git a/README.md b/README.md index 3e33c06..a21d215 100644 --- a/README.md +++ b/README.md @@ -236,6 +236,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **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. * **13.12.21:** - Switch strategy for mediainfo * **10.02.21:** - Rebase to mono focal baseimage. Switch to v3 nightlies. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index ae37643..cba7f78 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -15,7 +15,7 @@ repo_vars: - DOCKERHUB_IMAGE = 'linuxserver/sonarr' - DEV_DOCKERHUB_IMAGE = 'lsiodev/sonarr' - PR_DOCKERHUB_IMAGE = 'lspipepr/sonarr' - - DIST_IMAGE = 'alpine' + - DIST_IMAGE = 'ubuntu' - MULTIARCH='true' - CI='true' - CI_WEB='true' diff --git a/readme-vars.yml b/readme-vars.yml index f4ec86c..5ecaa52 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -44,7 +44,8 @@ app_setup_block: | # changelog changelogs: - - { date: "20.02.22:", desc: "Rebase develop branch to Alpine." } + - { 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." } - { date: "13.12.21:", desc: "Switch strategy for mediainfo" } - { date: "10.02.21:", desc: "Rebase to mono focal baseimage. Switch to v3 nightlies." } - { date: "18.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." } diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config index 7ab0aa7..9010fc3 100644 --- a/root/etc/cont-init.d/30-config +++ b/root/etc/cont-init.d/30-config @@ -4,13 +4,6 @@ [[ -e /config/sonarr.pid ]] && \ rm -rf /config/sonarr.pid -# update certs for mono -if [[ ! -f "/app/sonarr/donecerts" ]]; then - echo "*** Running mono cert sync ***" - cert-sync --quiet /etc/ssl/certs/ca-certificates.crt - touch "/app/sonarr/donecerts" -fi - # permissions chown -R abc:abc \ /app/sonarr/bin diff --git a/root/etc/services.d/sonarr/run b/root/etc/services.d/sonarr/run old mode 100644 new mode 100755 From 8443ad8f47076e7afaf764de5fb182ae441789fa Mon Sep 17 00:00:00 2001 From: TheSpad Date: Tue, 2 Aug 2022 16:22:27 +0100 Subject: [PATCH 2/5] Change bases for arm too --- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index c9d124e..de0b3df 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15 +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 5102bb9..6b3f414 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15 +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal # set version label ARG BUILD_DATE From 948a43cc5c3356a9d3fe1d10bf90745b05412597 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Tue, 2 Aug 2022 16:42:48 +0100 Subject: [PATCH 3/5] Add armhf deprecation warning. --- Dockerfile.armhf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 6b3f414..c0c1eb2 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -37,7 +37,7 @@ RUN \ tar xzf \ /tmp/sonarr.tar.gz -C \ /app/sonarr/bin --strip-components=1 && \ - echo "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)" > /app/sonarr/package_info && \ + echo "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)\nPackageGlobalMessage=Warn: Due to issues with Mono support this will be the last supported build for 32-bit arm (armhf) platforms. See [https://info.linuxserver.io](info.linuxserver.io) for more info." > /app/sonarr/package_info && \ rm -rf /app/sonarr/bin/Sonarr.Update && \ echo "**** cleanup ****" && \ apt-get clean && \ From 972ac457505c26a7908ffc754c06818c0b6ed538 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Tue, 2 Aug 2022 16:52:20 +0100 Subject: [PATCH 4/5] Actually definitely use the right bases for arm --- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index de0b3df..77102f2 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal +FROM ghcr.io/linuxserver/baseimage-mono:arm64v8-focal # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index c0c1eb2..877a4cc 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal +FROM ghcr.io/linuxserver/baseimage-mono:arm32v7-focal # set version label ARG BUILD_DATE From b5177b6640bafc6977d16d647f50838046ed8f1a Mon Sep 17 00:00:00 2001 From: TheSpad Date: Tue, 2 Aug 2022 17:07:36 +0100 Subject: [PATCH 5/5] Remove unsupported hyperlink --- Dockerfile.armhf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 877a4cc..0af3ee7 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -37,7 +37,7 @@ RUN \ tar xzf \ /tmp/sonarr.tar.gz -C \ /app/sonarr/bin --strip-components=1 && \ - echo "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)\nPackageGlobalMessage=Warn: Due to issues with Mono support this will be the last supported build for 32-bit arm (armhf) platforms. See [https://info.linuxserver.io](info.linuxserver.io) for more info." > /app/sonarr/package_info && \ + echo "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)\nPackageGlobalMessage=Warn: Due to issues with Mono support this will be the last supported build for 32-bit arm (armhf) platforms. See https://info.linuxserver.io for more info." > /app/sonarr/package_info && \ rm -rf /app/sonarr/bin/Sonarr.Update && \ echo "**** cleanup ****" && \ apt-get clean && \