From ff2d3e21ddc743ebd28abd598075543e9cb323b9 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Fri, 4 Aug 2023 19:15:27 +0200
Subject: [PATCH] Update Dockerfile

---
 webtop_kde/Dockerfile | 36 ------------------------------------
 1 file changed, 36 deletions(-)

diff --git a/webtop_kde/Dockerfile b/webtop_kde/Dockerfile
index 18e9ac0a0..806f6ac6c 100644
--- a/webtop_kde/Dockerfile
+++ b/webtop_kde/Dockerfile
@@ -27,37 +27,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
     S6_SERVICES_GRACETIME=0
 
-# Allow UID and GID setting
-# hadolint ignore=SC2015,DL4006,SC2013,SC2086
-#RUN \
-    # Change home folder location
-#    usermod --home /share/webtop_kde abc
-
-# Global LSIO modifications
-ARG CONFIGLOCATION="/data"
-# hadolint ignore=SC2015, SC2013, SC2086
-RUN \
-    # 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 \
-    \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \
-    \
-    # Allow UID and GID setting
-    && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \
-    \
-    # Correct config location
-    && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \
-    \
-    # Avoid chmod /config
-    && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $file ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done \
-    \
-    # Docker mods addition
-    #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \
-    \
-    # Replace lsiown if not found
-    && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi
-
 ##################
 # 3 Install apps #
 ##################
@@ -97,11 +66,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 # 4 Entrypoint #
 ################
 
-# Entrypoint logic
-RUN chmod 777 /entrypoint.sh && \
-    mv /etc/cont-init.d/* /etc/scripts && \
-    sed -i "s|/etc/cont-init.d|/etc/scripts|g" /entrypoint.sh && \
-    sed -i "1a /./entrypoint.sh" /etc/s6-overlay/s6-rc.d/init-adduser/run
 #WORKDIR /
 #ENTRYPOINT [ "/usr/bin/env" ]
 #CMD [ "/entrypoint.sh" ]