From d75e55abbb5602a4823ee2f0e787af38740f5315 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Tue, 31 Aug 2021 15:41:08 +0200
Subject: [PATCH] Update Dockerfile

---
 piwigo/Dockerfile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile
index f58aeffef..d0fa5c2da 100644
--- a/piwigo/Dockerfile
+++ b/piwigo/Dockerfile
@@ -29,10 +29,13 @@ RUN \
     # 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/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
     # Use subfolder in config
-#    && files=$(grep -rl '/config/' /defaults/*) && echo $files | xargs sed -i 's|/config/|/share/piwigo|g' \
-#    && files=$(grep -rl '/config/' /etc/cont-init.d/*) && echo $files | xargs sed -i 's|/config/|/share/piwigo|g'
+    # Protect files starting by config.
+    && files=$(grep -rl '/config.' /etc/cont-init.d/*) && echo $files | xargs sed -i 's|/config.|/temptemp.|g' \
+    && files=$(grep -rl '/config' /defaults/*) && echo $files | xargs sed -i 's|/config|/share/piwigo|g' \
+    && files=$(grep -rl '/config' /etc/cont-init.d/*) && echo $files | xargs sed -i 's|/config|/share/piwigo|g' \
+    && files=$(grep -rl '/temptemp.' /etc/cont-init.d/*) && echo $files | xargs sed -i 's|/temptemp.|/config.|g'
 #    && files=$(grep -rl "/config/" /etc/services.d/*) && echo $files | xargs sed -i "s|/config/|/share/piwigo|g"
 #    && files=$(grep -rl "    /config" /etc/cont-init.d/*) && echo $files | xargs sed -i "s=    /config=    /config/piwigo=g"
 #    && files=$(grep -rl '/data/config.inc.php' /defaults/*) && echo $files | xargs sed -i 's|/data/config.inc.php|/config/config.inc.php|g' || true \