From e22566820b37cf4aecc327b519b468dadd2f04e6 Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Wed, 20 Sep 2023 20:29:27 +0100
Subject: [PATCH] Install unrar from linuxserver repo

---
 Dockerfile         | 17 +++++------------
 Dockerfile.aarch64 | 17 +++++------------
 readme-vars.yml    |  1 +
 3 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fbb87e8..95ad6c1 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 BAZARR_VERSION
@@ -29,17 +30,6 @@ RUN \
     libxslt \
     mediainfo \
     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 bazarr ****" && \
   mkdir -p \
     /app/bazarr/bin && \
@@ -77,6 +67,9 @@ RUN \
 # add local files
 COPY root/ /
 
+# add unrar
+COPY --from=unrar /usr/bin/unrar-alpine /usr/bin/unrar
+
 # ports and volumes
 EXPOSE 6767
 
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 7758f77..cb08cbd 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 BAZARR_VERSION
@@ -29,17 +30,6 @@ RUN \
     libxslt \
     mediainfo \
     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 bazarr ****" && \
   mkdir -p \
     /app/bazarr/bin && \
@@ -77,6 +67,9 @@ RUN \
 # add local files
 COPY root/ /
 
+# add unrar
+COPY --from=unrar /usr/bin/unrar-alpine /usr/bin/unrar
+
 # ports and volumes
 EXPOSE 6767
 
diff --git a/readme-vars.yml b/readme-vars.yml
index cdd0e21..cd2bb01 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -38,6 +38,7 @@ app_setup_block: |
   - You must complete all the setup parameters in the webui before you can save the config.
 # changelog
 changelogs:
+  - {date: "19.09.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."}
   - {date: "11.08.23:", desc: "Rebase to Alpine 3.18."}
   - {date: "10.08.23:", desc: "Bump unrar to 6.2.10."}
   - {date: "04.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}