mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-05-31 04:44:05 +02:00
Update Dockerfile
This commit is contained in:
@@ -26,6 +26,25 @@ FROM ${BUILD_FROM}
|
|||||||
ENV S6_CMD_WAIT_FOR_SERVICES=1 \
|
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="/config"
|
||||||
|
# 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 '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
|
||||||
|
\
|
||||||
|
# Correct config location
|
||||||
|
&& for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
|
||||||
|
\
|
||||||
|
# Avoid chmod /config
|
||||||
|
&& for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
|
||||||
|
|
||||||
##################
|
##################
|
||||||
# 3 Install apps #
|
# 3 Install apps #
|
||||||
|
|||||||
Reference in New Issue
Block a user