From 4dc3841ab4a6179f244aca4828ae68455eef960f Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Wed, 16 Aug 2023 11:43:58 -0400
Subject: [PATCH] unstable: install unrar from lsio repo

---
 Dockerfile         | 17 +++++------------
 Dockerfile.aarch64 | 17 +++++------------
 README.md          |  1 +
 readme-vars.yml    |  3 ++-
 4 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e8303ee..b0d8876 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 SABNZBD_VERSION
@@ -25,17 +26,6 @@ RUN \
     7zip \
     par2cmdline \
     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 sabnzbd ****" && \  
   if [ -z ${SABNZBD_VERSION+x} ]; then \
     SABNZBD_VERSION=$(curl -s https://api.github.com/repos/sabnzbd/sabnzbd/releases \
@@ -80,6 +70,9 @@ RUN \
 # add local files
 COPY root/ /
 
+# add unrar
+COPY --from=unrar /usr/bin/unrar-alpine /usr/bin/unrar
+
 # ports and volumes
 EXPOSE 8080
 
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 9249b5c..665806d 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 SABNZBD_VERSION
@@ -25,17 +26,6 @@ RUN \
     7zip \
     par2cmdline \
     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 sabnzbd ****" && \  
   if [ -z ${SABNZBD_VERSION+x} ]; then \
     SABNZBD_VERSION=$(curl -s https://api.github.com/repos/sabnzbd/sabnzbd/releases \
@@ -80,6 +70,9 @@ RUN \
 # add local files
 COPY root/ /
 
+# add unrar
+COPY --from=unrar /usr/bin/unrar-alpine /usr/bin/unrar
+
 # ports and volumes
 EXPOSE 8080
 
diff --git a/README.md b/README.md
index a6d25fd..eb9fbfb 100644
--- a/README.md
+++ b/README.md
@@ -253,6 +253,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **16.08.23:** - Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar).
 * **10.08.23:** - Bump unrar to 6.2.10.
 * **16.05.23:** - Rebase unstable to Alpine 3.18, deprecate armhf.
 * **15.03.23:** - Switch from p7zip to 7zip, bump unrar to 6.2.6.
diff --git a/readme-vars.yml b/readme-vars.yml
index 7192bf6..1a6f9d4 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -70,7 +70,8 @@ app_setup_block: |
 
 # changelog
 changelogs:
-  - {date: "10.08.23:", desc: "Bump unrar to 6.2.10."}
+  - { date: "16.08.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: "16.05.23:", desc: "Rebase unstable to Alpine 3.18, deprecate armhf." }
   - { date: "15.03.23:", desc: "Switch from p7zip to 7zip, bump unrar to 6.2.6." }
   - { date: "05.03.23:", desc: "Rebase unstable branch to Alpine 3.17." }