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

New LSIO logic

Browse Source
This commit is contained in:
Alexandre
2022-09-09 17:43:42 +02:00
parent 6f6a20d52f
commit 30d3994d9e
3 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
flexget/Dockerfile
View File

@@ -37,21 +37,21 @@ RUN \
&& sed -i 's/# set FG_WEBUI_PASSWD/if bashio::config.has_value "WebuiPass"; then FG_WEBUI_PASSWD=$(bashio::config "WebuiPass"); else FG_WEBUI_PASSWD=""; fi/g' "$files" \ && sed -i 's/# set FG_WEBUI_PASSWD/if bashio::config.has_value "WebuiPass"; then FG_WEBUI_PASSWD=$(bashio::config "WebuiPass"); else FG_WEBUI_PASSWD=""; fi/g' "$files" \
&& sed -i 's/# install custom plugins/if bashio::config.has_value "FG_PLUGINS"; then FG_PLUGINS=$(bashio::config "FG_PLUGINS"); else FG_PLUGINS=""; fi/g' "$files" && sed -i 's/# install custom plugins/if bashio::config.has_value "FG_PLUGINS"; then FG_PLUGINS=$(bashio::config "FG_PLUGINS"); else FG_PLUGINS=""; fi/g' "$files"
# GLOBAL LSIO MODIFICATIONS # Global LSIO modifications
ARG CONFIGLOCATION="/config/addons_config/flexget" ARG CONFIGLOCATION="/config/addons_config/flexget"
# hadolint ignore=SC2015 # hadolint ignore=SC2015, SC2013
RUN \ RUN \
# Avoid custom-init.d duplications # Avoid custom-init.d duplications
rm -f $(grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d) \ 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 \
\
# change config folder
&& sed -i "s=/config=$CONFIGLOCATION || true=g" $(grep -sril '/config[ /$]' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d) \
\ \
# Allow UID and GID setting # Allow UID and GID setting
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \ && 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 \
sed -i 's/bash/bashio/g' "$file" && \ \
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \ # Correct config location
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done && 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 # # 3 Install apps #

24
grav/Dockerfile
View File

@@ -27,23 +27,21 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
S6_SERVICES_GRACETIME=0 S6_SERVICES_GRACETIME=0
# Global LSIO modifications
ARG CONFIGLOCATION="/share/grav"
# hadolint ignore=SC2015, SC2013
RUN \ RUN \
# use /data instead of /config for hass.io environment
sed -i "s|/config|/share/grav|g" /etc/cont-init.d/50-config \
&& sed -i "s|/share/grav/nginx|/config/nginx|g" /etc/cont-init.d/50-config \
\
# Avoid custom-init.d duplications # Avoid custom-init.d duplications
&& grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ 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 \
\
# 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 # Allow UID and GID setting
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \ && 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 \
sed -i 's/bash/bashio/g' "$file" && \ \
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \ # Correct config location
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done && 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 # # 3 Install apps #

24
jackett/Dockerfile
View File

@@ -27,21 +27,21 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
S6_SERVICES_GRACETIME=0 S6_SERVICES_GRACETIME=0
# use /data instead of /config for hass.io environment # Global LSIO modifications
RUN sed -i "s|/config|/config/addons_config/Jackett|g" /etc/cont-init.d/30-config \ ARG CONFIGLOCATION="/config/addons_config/Jackett"
\ # hadolint ignore=SC2015, SC2013
RUN \
# Avoid custom-init.d duplications # Avoid custom-init.d duplications
&& grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ 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 \
\
# 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 # Allow UID and GID setting
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \ && 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 \
sed -i 's/bash/bashio/g' "$file" && \ \
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \ # Correct config location
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done && 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
# Changes config directory # Changes config directory
ENV XDG_CONFIG_HOME="/config/addons_config" ENV XDG_CONFIG_HOME="/config/addons_config"