Hook entrypoint

2026-01-11 02:11:01 +01:00 · 2023-09-05 21:05:41 +02:00
parent f37ec91b09
commit 438f75a658
81 changed files with 167 additions and 81 deletions
--- a/addons_updater/Dockerfile
+++ b/addons_updater/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh


 ##################
--- a/arpspoof/Dockerfile
+++ b/arpspoof/Dockerfile
@@ -26,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 ##################
 # 3 Install apps #
--- a/autobrr/Dockerfile
+++ b/autobrr/Dockerfile
@@ -26,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/autobrr"
--- a/baikal/Dockerfile
+++ b/baikal/Dockerfile
@@ -26,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Image specific modifications
 # hadolint ignore=SC2015, SC2013, SC2086
--- a/bazarr/Dockerfile
+++ b/bazarr/Dockerfile
@@ -26,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/bazarr"
--- a/binance-trading-bot/Dockerfile
+++ b/binance-trading-bot/Dockerfile
@@ -26,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 ##################
 # 3 Install apps #
--- a/bitwarden/Dockerfile
+++ b/bitwarden/Dockerfile
@@ -33,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 ##################
 # 3 Install apps #
--- a/booksonic_air/Dockerfile
+++ b/booksonic_air/Dockerfile
@@ -26,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 ENV BOOKSONIC_AIR_SETTINGS="/data"

--- a/browserless_chrome/Dockerfile
+++ b/browserless_chrome/Dockerfile
@@ -26,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 USER root

--- a/calibre/Dockerfile
+++ b/calibre/Dockerfile
@@ -27,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/calibre"
--- a/calibre_web/Dockerfile
+++ b/calibre_web/Dockerfile
@@ -27,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 RUN \
    echo '#!/bin/sh' > /usr/bin/xdg-icon-resource && chmod +x /usr/bin/xdg-icon-resource \
--- a/cloudcommander/Dockerfile
+++ b/cloudcommander/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 ##################
 # 3 Install apps #
--- a/code-server/Dockerfile
+++ b/code-server/Dockerfile
@@ -26,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Global LSIO modifications
 ARG CONFIGLOCATION="/data"
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -24,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Data persistence
 # hadolint ignore=SC2016
--- a/emby/Dockerfile
+++ b/emby/Dockerfile
@@ -26,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Global LSIO modifications
 ARG CONFIGLOCATION="/emby"
--- a/enedisgateway2mqtt/Dockerfile
+++ b/enedisgateway2mqtt/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 ##################
 # 3 Install apps #
--- a/enedisgateway2mqtt_dev/Dockerfile
+++ b/enedisgateway2mqtt_dev/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 ##################
 # 3 Install apps #
--- a/epicgamesfree/Dockerfile
+++ b/epicgamesfree/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 RUN sed -i "1a /./ha_entrypoint.sh" /usr/local/bin/docker-entrypoint.sh

--- a/filebrowser/Dockerfile
+++ b/filebrowser/Dockerfile
@@ -26,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 ##################
 # 3 Install apps #
--- a/fireflyiii/Dockerfile
+++ b/fireflyiii/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 #ENV FIREFLY_III_PATH="/data/firefly"
 #WORKDIR $FIREFLY_III_PATH
--- a/fireflyiii_data_importer/Dockerfile
+++ b/fireflyiii_data_importer/Dockerfile
@@ -26,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 #ENV FIREFLY_III_PATH="/data/firefly"
 #WORKDIR $FIREFLY_III_PATH
--- a/fireflyiii_fints_importer/Dockerfile
+++ b/fireflyiii_fints_importer/Dockerfile
@@ -26,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 ##################
 # 3 Install apps #
--- a/flaresolverr/Dockerfile
+++ b/flaresolverr/Dockerfile
@@ -24,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 USER root

--- a/flexget/Dockerfile
+++ b/flexget/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 SHELL ["/bin/bash", "-o", "pipefail", "-c"]

--- a/free_games_claimer/Dockerfile
+++ b/free_games_claimer/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 ##################
 # 3 Install apps #
--- a/gazpar2mqtt/Dockerfile
+++ b/gazpar2mqtt/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 ENV TZ=Europe/Paris

--- a/gitea/Dockerfile
+++ b/gitea/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 USER root

--- a/grav/Dockerfile
+++ b/grav/Dockerfile
@@ -26,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Global LSIO modifications
 ARG CONFIGLOCATION="/share/grav"
--- a/guacamole/Dockerfile
+++ b/guacamole/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 ENV PGDATA=/config/addons_config/guacamole/postgres
 ENV GUACAMOLE_HOME=/config/addons_config/guacamole
--- a/immich/Dockerfile
+++ b/immich/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/immich"
--- a/inadyn/Dockerfile
+++ b/inadyn/Dockerfile
@@ -23,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 ARG BUILD_ARCH
 ENV LANG='C.UTF-8'\
--- a/jackett/Dockerfile
+++ b/jackett/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/Jackett"
--- a/jellyfin/Dockerfile
+++ b/jellyfin/Dockerfile
@@ -26,6 +26,7 @@ FROM ${BUILD_FROM}
 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_READ_ONLY_ROOT=1

 # Global LSIO modifications
--- a/jellyseerr/Dockerfile
+++ b/jellyseerr/Dockerfile
@@ -26,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/jellyseerr"
--- a/joal/Dockerfile
+++ b/joal/Dockerfile
@@ -26,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Install Joal
 # spellcheck disable=SC2015
--- a/joplin/Dockerfile
+++ b/joplin/Dockerfile
@@ -24,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 USER root

--- a/lidarr/Dockerfile
+++ b/lidarr/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/lidarr"
--- a/mealie/Dockerfile
+++ b/mealie/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 ENV FRONTEND_PORT=9925

--- a/mylar3/Dockerfile
+++ b/mylar3/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Global LSIO modifications
 ARG CONFIGLOCATION="/data"
--- a/nextcloud/Dockerfile
+++ b/nextcloud/Dockerfile
@@ -28,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Specific modifications
 ARG CONFIGLOCATION="/share/nextcloud"
--- a/nzbget/Dockerfile
+++ b/nzbget/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/nzbget"
--- a/omada/Dockerfile
+++ b/omada/Dockerfile
@@ -26,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 RUN echo "Adding symlinks to entrypoint" \
    && sed -i \
--- a/omada_v3/Dockerfile
+++ b/omada_v3/Dockerfile
@@ -26,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 RUN echo "Adding symlinks to entrypoint" \
    && sed -i \
--- a/ombi/Dockerfile
+++ b/ombi/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/ombi"
--- a/organizr/Dockerfile
+++ b/organizr/Dockerfile
@@ -24,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Global LSIO modifications
 ARG CONFIGLOCATION="/data/organizr"
--- a/overseerr/Dockerfile
+++ b/overseerr/Dockerfile
@@ -26,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/overseerr"
--- a/paperless_ngx/Dockerfile
+++ b/paperless_ngx/Dockerfile
@@ -26,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Add custom scripts
 #RUN \
--- a/papermerge/Dockerfile
+++ b/papermerge/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Image specific
 RUN \
--- a/photoprism/Dockerfile
+++ b/photoprism/Dockerfile
@@ -26,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 ENV workdir="/data/photoprism" \
    HOME="/data/photoprism"
--- a/piwigo/Dockerfile
+++ b/piwigo/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/piwigo"
--- a/plex/Dockerfile
+++ b/plex/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Image specific modifications
 # hadolint ignore=SC2016,SC2086
--- a/plex_meta_manager/Dockerfile
+++ b/plex_meta_manager/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 ENV HOME=/config/addons_config/plex-meta-manager

--- a/portainer/Dockerfile
+++ b/portainer/Dockerfile
@@ -24,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Set shell
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
--- a/portainer_agent/Dockerfile
+++ b/portainer_agent/Dockerfile
@@ -34,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 ##################
 # 3 Install apps #
--- a/postgres/Dockerfile
+++ b/postgres/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 RUN \
    # Correct for access
--- a/prowlarr/Dockerfile
+++ b/prowlarr/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/prowlarr"
--- a/qbittorrent/Dockerfile
+++ b/qbittorrent/Dockerfile
@@ -26,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Environment variables
 ENV \
--- a/radarr/Dockerfile
+++ b/radarr/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/radarr"
--- a/readarr/Dockerfile
+++ b/readarr/Dockerfile
@@ -26,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/readarr"
--- a/requestrr/Dockerfile
+++ b/requestrr/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Global LSIO modifications
 ARG CONFIGLOCATION="/data"
--- a/resiliosync/Dockerfile
+++ b/resiliosync/Dockerfile
@@ -26,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # hadolint ignore=SC2015,DL4006,SC2013,SC2086
 RUN \
--- a/sabnzbd/Dockerfile
+++ b/sabnzbd/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/sabnzbd"
--- a/scrutiny/Dockerfile
+++ b/scrutiny/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 ##################
 # 3 Install apps #
--- a/scrutiny_fa/Dockerfile
+++ b/scrutiny_fa/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 ##################
 # 3 Install apps #
--- a/seafile/Dockerfile
+++ b/seafile/Dockerfile
@@ -26,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 ENV LANG C.UTF-8

--- a/sonarr/Dockerfile
+++ b/sonarr/Dockerfile
@@ -26,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/sonarr"
--- a/sponsorblockcast/Dockerfile
+++ b/sponsorblockcast/Dockerfile
@@ -22,6 +22,12 @@ VOLUME [ "/data" ]
 # 2 Modify Image #
 ##################

+# 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
+
 ##################
 # 3 Install apps #
 ##################
--- a/spotweb/Dockerfile
+++ b/spotweb/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 ENV LANG C.UTF-8

--- a/tandoor_recipes/Dockerfile
+++ b/tandoor_recipes/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 ##################
 # 3 Install apps #
--- a/tdarr/Dockerfile
+++ b/tdarr/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 ##################
 # 3 Install apps #
--- a/teamspeak/Dockerfile
+++ b/teamspeak/Dockerfile
@@ -24,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 RUN mkdir -p /data \
    && chown -R 503:503 /data
--- a/transmission/Dockerfile
+++ b/transmission/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Modify image

--- a/transmission_openvpn/Dockerfile
+++ b/transmission_openvpn/Dockerfile
@@ -26,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # MOFIFY DATA PATH
 ENV CREATE_TUN_DEVICE=false \
--- a/ubooquity/Dockerfile
+++ b/ubooquity/Dockerfile
@@ -26,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 RUN \
    # Set default directory
--- a/unpackerr/Dockerfile
+++ b/unpackerr/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Global LSIO modifications
 ARG CONFIGLOCATION="/config"
--- a/webtop_kde/Dockerfile
+++ b/webtop_kde/Dockerfile
@@ -26,6 +26,7 @@ FROM ${BUILD_FROM}
 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_STAGE2_HOOK=/ha_entrypoint.sh

 # load volume
--- a/webtrees/Dockerfile
+++ b/webtrees/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Global variables
 ENV WEBTREES_HOME="/data/webtrees"
--- a/wger/Dockerfile
+++ b/wger/Dockerfile
@@ -24,10 +24,11 @@ FROM wger/devel:latest

 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000 \
-    \
-    SYNC_EXERCISES_ON_STARTUP=True \
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh
+
+ENV SYNC_EXERCISES_ON_STARTUP=True \
    DOWNLOAD_EXERCISE_IMAGES_ON_STARTUP=True \
    FROM_EMAIL='wger Workout Manager <wger@example.com>' \
    DJANGO_MEDIA_ROOT="/data/media" \
--- a/whoogle/Dockerfile
+++ b/whoogle/Dockerfile
@@ -25,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 USER root

--- a/xteve/Dockerfile
+++ b/xteve/Dockerfile
@@ -26,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 USER root

--- a/zoneminder/Dockerfile
+++ b/zoneminder/Dockerfile
@@ -26,7 +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_SERVICES_GRACETIME=0 \
+    S6_STAGE2_HOOK=/ha_entrypoint.sh

 # Change config location
 # hadolint ignore=DL4006