This commit is contained in:
Alexandre
2022-09-10 12:05:07 +02:00
parent 80d046610c
commit ed2056413c
11 changed files with 16 additions and 10 deletions

View File

@@ -26,7 +26,7 @@ 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
# hadolint ignore=DL4006 # hadolint ignore=DL4006,SC2013
RUN \ RUN \
######################################## ########################################
# Correct upstream image folders links # # Correct upstream image folders links #

View File

@@ -28,6 +28,7 @@ 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
# hadolint ignore=DL4006,SC2013
RUN sed -i "s|/config|/config/addons_config/addons_config/overseerr|g" /etc/services.d/overseerr/run \ RUN sed -i "s|/config|/config/addons_config/addons_config/overseerr|g" /etc/services.d/overseerr/run \
&& sed -i "s|/config|/config/addons_config/addons_config/overseerr|g" /etc/cont-init.d/30-config \ && sed -i "s|/config|/config/addons_config/addons_config/overseerr|g" /etc/cont-init.d/30-config \
\ \

View File

@@ -29,7 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
ENV PAPERLESS_DATA_DIR=/config/addons_config/paperless_ng ENV PAPERLESS_DATA_DIR=/config/addons_config/paperless_ng
# spellcheck disable=SC2015 # spellcheck disable=SC2015
# hadolint ignore=SC2015 # hadolint ignore=DL4006,SC2013
RUN \ RUN \
################# #################
# Correct image # # Correct image #

View File

@@ -27,7 +27,7 @@ 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
# hadolint ignore=SC2015 # hadolint ignore=SC2015,DL4006,SC2013
RUN \ 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 \ grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \

View File

@@ -27,6 +27,7 @@ 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
# hadolint ignore=SC2015,DL4006,SC2013
RUN \ 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 \ grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \

View File

@@ -29,6 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
ENV HOME=/config/addons_config/plex-data-manager ENV HOME=/config/addons_config/plex-data-manager
# hadolint ignore=SC2015,DL4006,SC2013
RUN \ RUN \
# use /data instead of /config for hass.io environment # use /data instead of /config for hass.io environment
sed -i "s|/config|/config/addons_config/plex-meta-manager|g" /etc/services.d/*/run \ sed -i "s|/config|/config/addons_config/plex-meta-manager|g" /etc/services.d/*/run \

View File

@@ -28,7 +28,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
S6_SERVICES_GRACETIME=0 S6_SERVICES_GRACETIME=0
# GLOBAL LSIO MODIFICATIONS # GLOBAL LSIO MODIFICATIONS
# hadolint ignore=SC2015 # hadolint ignore=SC2015,DL4006,SC2013
ARG CONFIGLOCATION="/config/addons_config/prowlarr" ARG CONFIGLOCATION="/config/addons_config/prowlarr"
RUN \ RUN \
# Avoid custom-init.d duplications # Avoid custom-init.d duplications
@@ -43,12 +43,12 @@ RUN \
sed -i 's/{PUID:-911}/(bashio::config "PUID")/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/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done
################## ##################
# 3 Install apps # # 3 Install apps #
################## ##################
# Add rootfs # Add rootfs
COPY rootfs/ / COPY rootfs/ /
# Corrects permissions for s6 v3 # Corrects permissions for s6 v3
RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \

View File

@@ -27,6 +27,7 @@ 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
# hadolint ignore=SC2015,DL4006,SC2013
RUN \ RUN \
# use /data instead of /config for hass.io environment # use /data instead of /config for hass.io environment
sed -i "s|/config|/config/addons_config/radarr|g" /etc/services.d/radarr/run \ sed -i "s|/config|/config/addons_config/radarr|g" /etc/services.d/radarr/run \

View File

@@ -28,6 +28,7 @@ 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
# hadolint ignore=SC2015,DL4006,SC2013
RUN sed -i "s|/config|/config/addons_config/readarr|g" /etc/services.d/readarr/run \ RUN sed -i "s|/config|/config/addons_config/readarr|g" /etc/services.d/readarr/run \
&& sed -i "s|/config|/config/addons_config/readarr|g" /etc/cont-init.d/30-config \ && sed -i "s|/config|/config/addons_config/readarr|g" /etc/cont-init.d/30-config \
\ \

View File

@@ -27,6 +27,7 @@ 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
# hadolint ignore=SC2015,DL4006,SC2013
RUN \ RUN \
# use /data instead of /config for hass.io environment # use /data instead of /config for hass.io environment
sed -i 's|/config \\|/data \\|g' /etc/cont-init.d/30-config \ sed -i 's|/config \\|/data \\|g' /etc/cont-init.d/30-config \

View File

@@ -28,7 +28,7 @@ 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
# hadolint ignore=DL4006 # hadolint ignore=SC2015,DL4006,SC2013
RUN \ RUN \
############### ###############
# Adapt image # # Adapt image #