diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 3d76337..2dc56b6 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-mono:arm32v7-focal +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal # set version label ARG BUILD_DATE @@ -12,41 +12,4 @@ ARG DEBIAN_FRONTEND="noninteractive" ENV XDG_CONFIG_HOME="/config/xdg" ENV SONARR_BRANCH="main" -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 ****" && \ - apt-get update && \ - apt-get install -y \ - jq \ - mediainfo && \ - echo "**** install sonarr ****" && \ - mkdir -p /app/sonarr/bin && \ - if [ -z ${SONARR_VERSION+x} ]; then \ - SONARR_VERSION=$(curl -sX GET http://services.sonarr.tv/v1/releases \ - | jq -r ".[] | select(.branch==\"$SONARR_BRANCH\") | .version"); \ - fi && \ - curl -o \ - /tmp/sonarr.tar.gz -L \ - "https://download.sonarr.tv/v3/${SONARR_BRANCH}/${SONARR_VERSION}/Sonarr.${SONARR_BRANCH}.${SONARR_VERSION}.linux.tar.gz" && \ - tar xf \ - /tmp/sonarr.tar.gz -C \ - /app/sonarr/bin --strip-components=1 && \ - echo "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://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 && \ - rm -rf \ - /tmp/* \ - /var/tmp/* - -# add local files -COPY root/ / - -# ports and volumes -EXPOSE 8989 -VOLUME /config +COPY /root-armhf / diff --git a/readme-vars.yml b/readme-vars.yml index ec190bc..2a3c628 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -12,7 +12,6 @@ project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_ available_architectures: - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} - - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"} # development version development_versions: true @@ -56,6 +55,7 @@ app_setup_block: | # changelog changelogs: + - { 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)." } - { date: "20.02.22:", desc: "Rebase develop branch to Alpine, deprecate develop-alpine branch." } diff --git a/root-armhf/etc/cont-init.d/50-armless b/root-armhf/etc/cont-init.d/50-armless new file mode 100644 index 0000000..31e79d6 --- /dev/null +++ b/root-armhf/etc/cont-init.d/50-armless @@ -0,0 +1,14 @@ +#!/usr/bin/with-contenv bash + +cat <<-EOF + ******************************************************** + ******************************************************** + * * + * !!!! * + * This image no longers supports * + * 32 bit ARM due to a lack of upstream packages * + * * + * * + ******************************************************** + ******************************************************** +EOF diff --git a/root-armhf/etc/services.d/armless/run b/root-armhf/etc/services.d/armless/run new file mode 100644 index 0000000..169b1e2 --- /dev/null +++ b/root-armhf/etc/services.d/armless/run @@ -0,0 +1,4 @@ +#!/usr/bin/with-contenv bash + +exec \ + s6-svscanctl -t /run/service/