Order

addons_updater/Dockerfile

@@ -25,8 +25,8 @@ VOLUME [ "/data" ]
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 
 ##################
@@ -64,6 +64,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

arpspoof/Dockerfile

@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ##################
 # 3 Install apps #
@@ -64,6 +64,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

autobrr/Dockerfile

@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/autobrr"
@@ -90,6 +90,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

baikal/Dockerfile

@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Image specific modifications
 # hadolint ignore=SC2015, SC2013, SC2086
@@ -68,6 +68,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

bazarr/Dockerfile

@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/bazarr"
@@ -87,6 +87,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

binance-trading-bot/Dockerfile

@@ -26,8 +26,8 @@ FROM $BUILD_FROM
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ##################
 # 3 Install apps #
@@ -84,6 +84,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

bitwarden/Dockerfile

@@ -33,8 +33,8 @@ COPY --from=vaultwarden /web-vault /opt/web-vault
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ##################
 # 3 Install apps #
@@ -74,6 +74,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

booksonic_air/Dockerfile

@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}${BUILD_UPSTREAM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ENV BOOKSONIC_AIR_SETTINGS="/data"
 
@@ -92,6 +92,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

browserless_chrome/Dockerfile

@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}${BUILD_UPSTREAM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 USER root
 
@@ -68,6 +68,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

calibre/Dockerfile

@@ -27,8 +27,8 @@ ENV BASHIO_VERSION=1.29.1
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/calibre"
@@ -93,6 +93,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

calibre_web/Dockerfile

@@ -27,8 +27,8 @@ ENV BASHIO_VERSION=1.29.1
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 RUN \
     echo '#!/bin/sh' > /usr/bin/xdg-icon-resource && chmod +x /usr/bin/xdg-icon-resource \
@@ -101,6 +101,7 @@ RUN if ! command -v sqlite3 >/dev/null 2>/dev/null; then (apt-get update && apt-
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

cloudcommander/Dockerfile

@@ -25,8 +25,8 @@ FROM coderaiser/cloudcmd:${BUILD_UPSTREAM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ##################
 # 3 Install apps #
@@ -66,6 +66,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

code-server/Dockerfile

@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/data"
@@ -87,6 +87,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

elasticsearch/Dockerfile

@@ -24,8 +24,8 @@ FROM elasticsearch:$BUILD_UPSTREAM
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Data persistence
 # hadolint ignore=SC2016
@@ -76,6 +76,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

emby/Dockerfile

@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/emby"
@@ -86,6 +86,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

enedisgateway2mqtt/Dockerfile

@@ -25,8 +25,8 @@ FROM m4dm4rtig4n/myelectricaldata:$BUILD_UPSTREAM
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ##################
 # 3 Install apps #
@@ -63,6 +63,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

enedisgateway2mqtt_dev/Dockerfile

@@ -25,8 +25,8 @@ FROM m4dm4rtig4n/myelectricaldata:latest-dev
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ##################
 # 3 Install apps #
@@ -63,6 +63,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

epicgamesfree/Dockerfile

@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 RUN sed -i "1a /./ha_entrypoint.sh" /usr/local/bin/docker-entrypoint.sh
 
@@ -65,6 +65,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

filebrowser/Dockerfile

@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ##################
 # 3 Install apps #
@@ -65,6 +65,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

fireflyiii/Dockerfile

@@ -25,8 +25,8 @@ FROM fireflyiii/core:latest
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 #ENV FIREFLY_III_PATH="/data/firefly"
 #WORKDIR $FIREFLY_III_PATH
@@ -74,6 +74,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

fireflyiii_data_importer/Dockerfile

@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 #ENV FIREFLY_III_PATH="/data/firefly"
 #WORKDIR $FIREFLY_III_PATH
@@ -70,6 +70,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

fireflyiii_fints_importer/Dockerfile

@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ##################
 # 3 Install apps #
@@ -64,6 +64,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

flaresolverr/Dockerfile

@@ -24,8 +24,8 @@ FROM flaresolverr/flaresolverr:latest
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 USER root
 
@@ -64,6 +64,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

flexget/Dockerfile

@@ -25,8 +25,8 @@ FROM wiserain/flexget:latest
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
@@ -98,6 +98,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

free_games_claimer/Dockerfile

@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ##################
 # 3 Install apps #
@@ -63,6 +63,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

gazpar2mqtt/Dockerfile

@@ -25,8 +25,8 @@ FROM yukulehe/gazpar2mqtt:$BUILD_UPSTREAM
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ENV TZ=Europe/Paris
 
@@ -65,6 +65,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

gitea/Dockerfile

@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 USER root
 
@@ -67,6 +67,7 @@ EXPOSE 22 3000
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

grav/Dockerfile

@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/share/grav"
@@ -90,6 +90,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

guacamole/Dockerfile

@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ENV PGDATA=/config/addons_config/guacamole/postgres
 ENV GUACAMOLE_HOME=/config/addons_config/guacamole
@@ -95,6 +95,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

immich/Dockerfile

@@ -25,8 +25,8 @@ FROM $BUILD_FROM
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/immich"
@@ -105,6 +105,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

inadyn/Dockerfile

@@ -23,8 +23,8 @@ FROM troglobit/inadyn:latest
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ARG BUILD_ARCH
 ENV LANG='C.UTF-8'\
@@ -88,6 +88,7 @@ RUN apk add --no-cache \
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

jackett/Dockerfile

@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/Jackett"
@@ -89,6 +89,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

jellyfin/Dockerfile

@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=0 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh \
+    S6_SERVICES_GRACETIME=0
+ \
     S6_READ_ONLY_ROOT=1
 
 # Global LSIO modifications
@@ -94,6 +94,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

jellyseerr/Dockerfile

@@ -26,8 +26,8 @@ ENV BASHIO_VERSION=1.29.1
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/jellyseerr"
@@ -71,6 +71,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

joal/Dockerfile

@@ -26,8 +26,8 @@ FROM anthonyraymond/joal:$BUILD_UPSTREAM
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Install Joal
 # spellcheck disable=SC2015
@@ -76,6 +76,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

joplin/Dockerfile

@@ -24,8 +24,8 @@ FROM florider89/joplin-server:latest
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 USER root
 
@@ -70,6 +70,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

lidarr/Dockerfile

@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/lidarr"
@@ -89,6 +89,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

mealie/Dockerfile

@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ENV FRONTEND_PORT=9925
 
@@ -71,6 +71,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

mylar3/Dockerfile

@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/data"
@@ -86,6 +86,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

nextcloud/Dockerfile

@@ -28,8 +28,8 @@ FROM ${BUILD_FROM}${BUILD_UPSTREAM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Specific modifications
 ARG CONFIGLOCATION="/share/nextcloud"
@@ -111,6 +111,7 @@ VOLUME ["/share", "/ssl", "/data", "/media"]
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

nzbget/Dockerfile

@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/nzbget"
@@ -86,6 +86,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

omada/Dockerfile

@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 RUN echo "Adding symlinks to entrypoint" \
     && sed -i \
@@ -71,6 +71,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

omada_v3/Dockerfile

@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 RUN echo "Adding symlinks to entrypoint" \
     && sed -i \
@@ -72,6 +72,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

ombi/Dockerfile

@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/ombi"
@@ -86,6 +86,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

organizr/Dockerfile

@@ -24,8 +24,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/data/organizr"
@@ -86,6 +86,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

overseerr/Dockerfile

@@ -26,8 +26,8 @@ ENV BASHIO_VERSION=1.29.1
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/overseerr"
@@ -87,6 +87,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

paperless_ngx/Dockerfile

@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}:${BUILD_UPSTREAM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Add custom scripts
 #RUN \
@@ -68,6 +68,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

papermerge/Dockerfile

@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Image specific
 RUN \
@@ -96,6 +96,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

photoprism/Dockerfile

@@ -26,8 +26,8 @@ FROM photoprism/photoprism:preview
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ENV workdir="/data/photoprism" \
     HOME="/data/photoprism"
@@ -75,6 +75,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

piwigo/Dockerfile

@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/piwigo"
@@ -88,6 +88,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

plex/Dockerfile

@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Image specific modifications
 # hadolint ignore=SC2016,SC2086
@@ -98,6 +98,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

plex_meta_manager/Dockerfile

@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ENV HOME=/config/addons_config/plex-meta-manager
 
@@ -94,6 +94,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

portainer/Dockerfile

@@ -24,8 +24,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Set shell
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -86,6 +86,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

portainer_agent/Dockerfile

@@ -34,8 +34,8 @@ COPY --from=original_agent /app /app
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ##################
 # 3 Install apps #
@@ -72,6 +72,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

postgres/Dockerfile

@@ -25,8 +25,8 @@ FROM postgres:15-alpine
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 RUN \
     # Correct for access
@@ -68,6 +68,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

prowlarr/Dockerfile

@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/prowlarr"
@@ -89,6 +89,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

qbittorrent/Dockerfile

@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Environment variables
 ENV \
@@ -124,6 +124,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

radarr/Dockerfile

@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/radarr"
@@ -90,6 +90,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

readarr/Dockerfile

@@ -26,8 +26,8 @@ ENV BASHIO_VERSION=0.14.3
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/readarr"
@@ -87,6 +87,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

requestrr/Dockerfile

@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/data"
@@ -89,6 +89,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

resiliosync/Dockerfile

@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # hadolint ignore=SC2015,DL4006,SC2013,SC2086
 RUN \
@@ -109,6 +109,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

sabnzbd/Dockerfile

@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/sabnzbd"
@@ -86,6 +86,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

scrutiny/Dockerfile

@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ##################
 # 3 Install apps #
@@ -66,6 +66,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

scrutiny_fa/Dockerfile

@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ##################
 # 3 Install apps #
@@ -66,6 +66,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

seafile/Dockerfile

@@ -26,8 +26,8 @@ ENV BASHIO_VERSION=1.29.1
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ENV LANG C.UTF-8
 
@@ -68,6 +68,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

sonarr/Dockerfile

@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/sonarr"
@@ -90,6 +90,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

sponsorblockcast/Dockerfile

@@ -25,8 +25,8 @@ VOLUME [ "/data" ]
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ##################
 # 3 Install apps #
@@ -65,6 +65,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

spotweb/Dockerfile

@@ -25,8 +25,8 @@ FROM $BUILD_FROM
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ENV LANG C.UTF-8
 
@@ -121,6 +121,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

tandoor_recipes/Dockerfile

@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ##################
 # 3 Install apps #
@@ -62,6 +62,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

tdarr/Dockerfile

@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ##################
 # 3 Install apps #
@@ -63,6 +63,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

teamspeak/Dockerfile

@@ -24,8 +24,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 RUN mkdir -p /data \
     && chown -R 503:503 /data
@@ -69,6 +69,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

transmission/Dockerfile

@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Modify image
 
@@ -98,6 +98,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

transmission_openvpn/Dockerfile

@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # MOFIFY DATA PATH
 ENV CREATE_TUN_DEVICE=false \
@@ -91,6 +91,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

ubooquity/Dockerfile

@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 RUN \
     # Set default directory
@@ -99,6 +99,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

unpackerr/Dockerfile

@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config"
@@ -85,6 +85,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

webtop_kde/Dockerfile

@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # load volume
 VOLUME [ "/sys/fs/cgroup" ]
@@ -95,6 +95,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

webtrees/Dockerfile

@@ -25,8 +25,8 @@ FROM nathanvaughn/webtrees:latest
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global variables
 ENV WEBTREES_HOME="/data/webtrees"
@@ -76,6 +76,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

wger/Dockerfile

@@ -25,8 +25,8 @@ FROM wger/devel:latest
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ENV SYNC_EXERCISES_ON_STARTUP=True \
     DOWNLOAD_EXERCISE_IMAGES_ON_STARTUP=True \
@@ -73,6 +73,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

whoogle/Dockerfile

@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 USER root
 
@@ -68,6 +68,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

xteve/Dockerfile

@@ -26,8 +26,8 @@ FROM $BUILD_FROM
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 USER root
 
@@ -68,6 +68,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3

zoneminder/Dockerfile

@@ -26,8 +26,8 @@ FROM tritruongtr/zoneminder:latest
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Change config location
 # hadolint ignore=DL4006
@@ -73,6 +73,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3