diff --git a/Dockerfile b/Dockerfile index 249d952..95f8db3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +FROM ghcr.io/linuxserver/unrar:latest as unrar + FROM ghcr.io/by275/libtorrent:2-alpine3.18 as libtorrent FROM ghcr.io/linuxserver/baseimage-alpine:3.18 # set version label -ARG UNRAR_VERSION=6.2.10 ARG BUILD_DATE ARG VERSION ARG FLEXGET_VERSION @@ -29,17 +30,6 @@ RUN \ libstdc++ \ nodejs \ 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 flexget ****" && \ if [ -z ${FLEXGET_VERSION+x} ]; then \ FLEXGET_VERSION=$(curl -s https://api.github.com/repos/flexget/flexget/releases/latest \ @@ -76,6 +66,9 @@ COPY --from=libtorrent /libtorrent-build/usr/lib/python3.11 /lsiopy/lib/python3. # add local files COPY root/ / +# add unrar +COPY --from=unrar /usr/bin/unrar-alpine /usr/bin/unrar + # ports and volumes EXPOSE 5050 VOLUME /config diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 79fad4d..2b97124 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,11 +1,12 @@ # syntax=docker/dockerfile:1 +FROM ghcr.io/linuxserver/unrar:arm64v8-latest as unrar + FROM ghcr.io/by275/libtorrent:2-alpine3.18 as libtorrent FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18 # set version label -ARG UNRAR_VERSION=6.2.10 ARG BUILD_DATE ARG VERSION ARG FLEXGET_VERSION @@ -29,17 +30,6 @@ RUN \ libstdc++ \ nodejs \ 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 flexget ****" && \ if [ -z ${FLEXGET_VERSION+x} ]; then \ FLEXGET_VERSION=$(curl -s https://api.github.com/repos/flexget/flexget/releases/latest \ @@ -76,6 +66,9 @@ COPY --from=libtorrent /libtorrent-build/usr/lib/python3.11 /lsiopy/lib/python3. # add local files COPY root/ / +# add unrar +COPY --from=unrar /usr/bin/unrar-alpine /usr/bin/unrar + # ports and volumes EXPOSE 5050 VOLUME /config diff --git a/readme-vars.yml b/readme-vars.yml index 060865c..3a0bd87 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -57,5 +57,6 @@ 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: "03.07.23:", desc: "Initial Release." }