From 15d3987c5a0f9380a972c479c20787a1696d8fda Mon Sep 17 00:00:00 2001
From: Graham Booker <gbooker@plexapp.com>
Date: Fri, 16 Oct 2020 10:35:40 -0500
Subject: [PATCH] Updated ARM containers to use Focal

---
 Dockerfile.arm64 | 13 +++++++------
 Dockerfile.armv7 | 13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
index 733ed25..f63448b 100644
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 
 ARG S6_OVERLAY_VERSION=v1.22.1.0
 ARG S6_OVERLAY_ARCH=aarch64
@@ -19,22 +19,23 @@ RUN \
       uuid-runtime \
       unrar \
     && \
-
+    \
 # Fetch and extract S6 overlay
     curl -J -L -o /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.gz https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-${S6_OVERLAY_ARCH}.tar.gz && \
-    tar xzf /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.gz -C / && \
-
+    tar xzf /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.gz -C / --exclude='./bin' && \
+    tar xzf /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.gz -C /usr ./bin && \
+    \
 # Add user
     useradd -U -d /config -s /bin/false plex && \
     usermod -G users plex && \
-
+    \
 # Setup directories
     mkdir -p \
       /config \
       /transcode \
       /data \
     && \
-
+    \
 # Cleanup
     apt-get -y autoremove && \
     apt-get -y clean && \
diff --git a/Dockerfile.armv7 b/Dockerfile.armv7
index 2f7fa35..41a60c6 100644
--- a/Dockerfile.armv7
+++ b/Dockerfile.armv7
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 
 ARG S6_OVERLAY_VERSION=v1.22.1.0
 ARG S6_OVERLAY_ARCH=armhf
@@ -19,22 +19,23 @@ RUN \
       uuid-runtime \
       unrar \
     && \
-
+    \
 # Fetch and extract S6 overlay
     curl -J -L -o /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.gz https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-${S6_OVERLAY_ARCH}.tar.gz && \
-    tar xzf /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.gz -C / && \
-
+    tar xzf /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.gz -C / --exclude='./bin' && \
+    tar xzf /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.gz -C /usr ./bin && \
+    \
 # Add user
     useradd -U -d /config -s /bin/false plex && \
     usermod -G users plex && \
-
+    \
 # Setup directories
     mkdir -p \
       /config \
       /transcode \
       /data \
     && \
-
+    \
 # Cleanup
     apt-get -y autoremove && \
     apt-get -y clean && \