diff --git a/Dockerfile b/Dockerfile index 64d85aa..ad0ca74 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,10 @@ # syntax=docker/dockerfile:1 +FROM ghcr.io/linuxserver/unrar:latest as unrar + FROM ghcr.io/linuxserver/baseimage-alpine:3.18 # set version label -ARG UNRAR_VERSION=6.2.10 ARG BUILD_DATE ARG VERSION ARG SICKCHILL_VERSION @@ -30,17 +31,6 @@ RUN \ libssl1.1 \ libxslt \ python3 && \ - echo "**** install unrar from source ****" && \ - mkdir /tmp/unrar && \ - curl -o \ - /tmp/unrar.tar.gz -L \ - "https://www.rarlab.com/rar/unrarsrc-${UNRAR_VERSION}.tar.gz" && \ - tar xf \ - /tmp/unrar.tar.gz -C \ - /tmp/unrar --strip-components=1 && \ - cd /tmp/unrar && \ - make && \ - install -v -m755 unrar /usr/local/bin && \ echo "**** install sickchill ****" && \ if [ -z ${SICKCHILL_VERSION+x} ]; then \ SICKCHILL_VERSION=$(curl -sL https://pypi.python.org/pypi/sickchill/json |jq -r '. | .info.version'); \ @@ -63,6 +53,9 @@ RUN \ # copy local files COPY root/ / +# add unrar +COPY --from=unrar /usr/bin/unrar-alpine /usr/bin/unrar + # ports and volumes EXPOSE 8081 VOLUME /config diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 40c90e9..41ac44c 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,9 +1,10 @@ # syntax=docker/dockerfile:1 +FROM ghcr.io/linuxserver/unrar:arm64v8-latest as unrar + FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18 # set version label -ARG UNRAR_VERSION=6.2.10 ARG BUILD_DATE ARG VERSION ARG SICKCHILL_VERSION @@ -30,17 +31,6 @@ RUN \ libssl1.1 \ libxslt \ python3 && \ - echo "**** install unrar from source ****" && \ - mkdir /tmp/unrar && \ - curl -o \ - /tmp/unrar.tar.gz -L \ - "https://www.rarlab.com/rar/unrarsrc-${UNRAR_VERSION}.tar.gz" && \ - tar xf \ - /tmp/unrar.tar.gz -C \ - /tmp/unrar --strip-components=1 && \ - cd /tmp/unrar && \ - make && \ - install -v -m755 unrar /usr/local/bin && \ echo "**** install sickchill ****" && \ if [ -z ${SICKCHILL_VERSION+x} ]; then \ SICKCHILL_VERSION=$(curl -sL https://pypi.python.org/pypi/sickchill/json |jq -r '. | .info.version'); \ @@ -63,6 +53,9 @@ RUN \ # copy local files COPY root/ / +# add unrar +COPY --from=unrar /usr/bin/unrar-alpine /usr/bin/unrar + # ports and volumes EXPOSE 8081 VOLUME /config diff --git a/readme-vars.yml b/readme-vars.yml index 4d035e2..b60fbbd 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -29,6 +29,7 @@ app_setup_block: | Web interface is at `:8081` , set paths for downloads, tv-shows to match docker mappings via the webui. # changelog changelogs: + - {date: "07.10.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."} - {date: "10.08.23:", desc: "Bump unrar to 6.2.10."} - {date: "12.07.23:", desc: "Rebase to alpine 3.18."} - {date: "06.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}