From 9666b13f11909e9a7abc389c0b8ce5ca6fa7882d Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Wed, 16 Aug 2023 12:01:22 -0400
Subject: [PATCH] install unrar from linuxserver repo remove obsolete port

---
 Dockerfile         | 10 ++++++++--
 Dockerfile.aarch64 |  9 ++++++++-
 README.md          |  1 +
 readme-vars.yml    |  2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 26a889b..36ef5db 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,7 @@
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/unrar:latest as unrar
+
 FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy
 
 # set version label
@@ -27,7 +31,6 @@ RUN \
   apt-get install -y \
     jq \
     udev \
-    unrar \
     wget && \
   echo "**** install plex ****" && \
   if [ -z ${PLEX_RELEASE+x} ]; then \
@@ -51,6 +54,9 @@ RUN \
 # add local files
 COPY root/ /
 
+# add unrar
+COPY --from=unrar /usr/bin/unrar-ubuntu /usr/bin/unrar
+
 # ports and volumes
-EXPOSE 32400/tcp 1900/udp 3005/tcp 5353/udp 8324/tcp 32410/udp 32412/udp 32413/udp 32414/udp 32469/tcp
+EXPOSE 32400/tcp 1900/udp 5353/udp 8324/tcp 32410/udp 32412/udp 32413/udp 32414/udp 32469/tcp
 VOLUME /config
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index a005fdd..3492c98 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,3 +1,7 @@
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/unrar:arm64v8-latest as unrar
+
 FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy
 
 # set version label
@@ -48,6 +52,9 @@ RUN \
 # add local files
 COPY root/ /
 
+# add unrar
+COPY --from=unrar /usr/bin/unrar-ubuntu /usr/bin/unrar
+
 # ports and volumes
-EXPOSE 32400/tcp 1900/udp 3005/tcp 5353/udp 8324/tcp 32410/udp 32412/udp 32413/udp 32414/udp 32469/tcp
+EXPOSE 32400/tcp 1900/udp 5353/udp 8324/tcp 32410/udp 32412/udp 32413/udp 32414/udp 32469/tcp
 VOLUME /config
diff --git a/README.md b/README.md
index 8317bba..0160392 100644
--- a/README.md
+++ b/README.md
@@ -294,6 +294,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).
 * **03.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)
 * **16.10.22:** - Rebase to jammy. Update to s6v3. Remove opencl packages (bundled with plex).
 * **18.07.22:** - Pin all opencl related driver packages.
diff --git a/readme-vars.yml b/readme-vars.yml
index cbd92c4..e687267 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -40,7 +40,6 @@ optional_parameters: |
   ```
     -p 32400:32400 \
     -p 1900:1900/udp \
-    -p 3005:3005 \
     -p 5353:5353/udp \
     -p 8324:8324 \
     -p 32410:32410/udp \
@@ -96,6 +95,7 @@ app_setup_block: |
   We automatically add the necessary environment variable that will utilise all the features available on a GPU on the host. Once nvidia-docker is installed on your host you will need to re/create the docker container with the nvidia container runtime `--runtime=nvidia` and add an environment variable `-e NVIDIA_VISIBLE_DEVICES=all` (can also be set to a specific gpu's UUID, this can be discovered by running `nvidia-smi --query-gpu=gpu_name,gpu_uuid --format=csv` ). NVIDIA automatically mounts the GPU and drivers from your host into the plex docker.
 # changelog
 changelogs:
+  - {date: "16.08.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."}
   - {date: "03.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}
   - {date: "16.10.22:", desc: "Rebase to jammy. Update to s6v3. Remove opencl packages (bundled with plex)."}
   - {date: "18.07.22:", desc: "Pin all opencl related driver packages."}