diff --git a/Dockerfile b/Dockerfile index d6d8e4e..bd2034f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,9 @@ # syntax=docker/dockerfile:1 +FROM ghcr.io/linuxserver/unrar:latest as unrar + FROM ghcr.io/linuxserver/baseimage-alpine:edge -ARG UNRAR_VERSION=6.2.10 ARG BUILD_DATE ARG VERSION ARG TRANSMISSION_VERSION @@ -18,17 +19,6 @@ RUN \ findutils \ p7zip \ 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 transmission ****" && \ if [ -z ${TRANSMISSION_VERSION+x} ]; then \ TRANSMISSION_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ @@ -49,6 +39,9 @@ RUN \ # copy local files COPY root/ / +# add unrar +COPY --from=unrar /usr/bin/unrar-alpine /usr/bin/unrar + # ports and volumes EXPOSE 9091 51413/tcp 51413/udp VOLUME /config diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 272d566..6c914a6 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,5 +1,7 @@ # syntax=docker/dockerfile:1 +FROM ghcr.io/linuxserver/unrar:arm64v8-latest as unrar + FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-edge ARG UNRAR_VERSION=6.2.10 @@ -18,17 +20,6 @@ RUN \ findutils \ p7zip \ 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 transmission ****" && \ if [ -z ${TRANSMISSION_VERSION+x} ]; then \ TRANSMISSION_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ @@ -49,6 +40,9 @@ RUN \ # copy local files COPY root/ / +# add unrar +COPY --from=unrar /usr/bin/unrar-alpine /usr/bin/unrar + # ports and volumes EXPOSE 9091 51413/tcp 51413/udp VOLUME /config diff --git a/readme-vars.yml b/readme-vars.yml index d184f36..69e0d00 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -80,7 +80,8 @@ app_setup_block: | # changelog changelogs: - - {date: "10.08.23:", desc: "Bump unrar to 6.2.10."} + - { 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: "10.06.23:", desc: "Bump unrar to 6.2.8, install transmission-extra." } - { date: "25.05.23:", desc: "Deprecate armhf." } - { date: "14.05.23:", desc: "Explicitly install transmission-remote." }