avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-05-24 17:51:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

new LSIO logic

Browse Source
This commit is contained in:
Alexandre
2022-09-10 12:24:41 +02:00
parent c929398940
commit 047cdc739a
13 changed files with 208 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
webtop_kde/Dockerfile
View File

@@ -29,23 +29,9 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
# Allow UID and GID setting
# hadolint ignore=SC2015,DL4006,SC2013
RUN grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \
\
# Prevent changing ownership of /config
#&& grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs -r rm \
&& if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \
\
# 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 \
\
RUN \
# Change home folder location
&& sed -i 's|/config|/share/webtop_kde|g' /defaults/* \
&& sed -i 's|/config|/share/webtop_kde|g' /etc/cont-init.d/* \
&& sed -i 's|/config|/share/webtop_kde|g' /etc/services.d/*/run \
&& usermod --home /share/webtop_kde abc \
usermod --home /share/webtop_kde abc \
\
# Correct error in upstream image
&& sed -i 's|startwm |startwm.sh |g' /etc/cont-init.d/30-config \
@@ -54,6 +40,25 @@ RUN grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overla
# hadolint ignore=DL3017
&& apk upgrade --no-cache
# Global LSIO modifications
ARG CONFIGLOCATION="/share/webtop_kde"
# hadolint ignore=SC2015, SC2013
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:-911" /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:-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 #
##################