From 6f6a20d52f12b15c59430610ae1f76bc88d01785 Mon Sep 17 00:00:00 2001
From: Alexandre <alexandre.pary@gmail.com>
Date: Fri, 9 Sep 2022 17:36:31 +0200
Subject: [PATCH] new LSIO logic

---
 emby/Dockerfile | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/emby/Dockerfile b/emby/Dockerfile
index c86088b3a..530a5f5bd 100644
--- a/emby/Dockerfile
+++ b/emby/Dockerfile
@@ -27,19 +27,21 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
     S6_SERVICES_GRACETIME=0
 
-# Set shell
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-
+# Global LSIO modifications
+ARG CONFIGLOCATION="/emby"
+# hadolint ignore=SC2015, SC2013
 RUN \
-    # Allow UID and GID setting
-    sed -i 's/bash/bashio/g' /etc/cont-init.d/* \
-    && 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 \
+    # Avoid custom-init.d duplications
+    for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
-    # FOLDERS
-    && sed -i "s|/config|/emby|g" /etc/services.d/emby/run \
-    && sed -i "s|/config|/emby|g" /etc/cont-init.d/30-config
+    # Allow UID and GID setting
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \
+    \
+    # Correct config location
+    && for file in $(grep -sril '/config[ /$]' /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
+    \
+    # Avoid changing /config permissions
+    && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done
 
 ##################
 # 3 Install apps #