From dea77a2855373fb7a300c7a0a34ea48b4a2d8ecf Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Thu, 26 Aug 2021 08:01:09 +0200
Subject: [PATCH] Update Dockerfile

---
 plex/Dockerfile | 42 +++++++++++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/plex/Dockerfile b/plex/Dockerfile
index a6703e960..ac76b4ff0 100644
--- a/plex/Dockerfile
+++ b/plex/Dockerfile
@@ -5,20 +5,19 @@ FROM ${BUILD_FROM}
 # Set shell
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
-ARG BASHIO_VERSION=0.13.1 
+ARG BASHIO_VERSION=0.13.1
 RUN \
     ################
     # Install apps #
     ################
     apt-get update \
-    && apt-get install -y \
-        jq \
-        curl \
-        cifs-utils \
-        keyutils \
-        samba \
-    \ 
-    ###################
+    && apt-get install -y --no-install-recommends \
+    jq \
+    cifs-utils \
+    keyutils \
+    samba \
+    \
+    ##################
     # Install bashio #
     ##################
     && mkdir -p /tmp/bashio \
@@ -26,10 +25,27 @@ RUN \
     | tar -xzf - --strip 1 -C /tmp/bashio \
     && mv /tmp/bashio/lib /usr/lib/bashio \
     && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
-    && rm -rf /tmp/bashio
-
-RUN grep -rl '/config' /etc/cont-init.d/ | xargs sed -i 's|/config|/config/plex|g'  #change config folder
-
+    && rm -rf /tmp/bashio \
+    \
+    /var/{cache,log}/* \
+    /var/lib/apt/lists/* \
+    \
+    #############################
+    # Allow UID and GID setting #
+    #############################
+    \
+    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
+    && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
+    && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
+    && sed -i "s|chown abc:abc /config||g" /etc/cont-init.d/10-adduser \
+    \
+    ###########
+    # FOLDERS #
+    ###########
+    \
+    && sed -i "s|/config|/data/plex|g" /etc/services.d/plex/run \
+    && sed -i "s|/config|/data/plex|g" /etc/cont-init.d/30-config
+ 
 # copy local files
 COPY root/ /