From 438f75a658bcf224c17aecf1f2a3e34a71b9c3cf Mon Sep 17 00:00:00 2001 From: Alexandre Date: Tue, 5 Sep 2023 21:05:41 +0200 Subject: [PATCH] Hook entrypoint --- addons_updater/Dockerfile | 3 ++- arpspoof/Dockerfile | 3 ++- autobrr/Dockerfile | 3 ++- baikal/Dockerfile | 3 ++- bazarr/Dockerfile | 3 ++- binance-trading-bot/Dockerfile | 3 ++- bitwarden/Dockerfile | 3 ++- booksonic_air/Dockerfile | 3 ++- browserless_chrome/Dockerfile | 3 ++- calibre/Dockerfile | 3 ++- calibre_web/Dockerfile | 3 ++- cloudcommander/Dockerfile | 3 ++- code-server/Dockerfile | 3 ++- elasticsearch/Dockerfile | 3 ++- emby/Dockerfile | 3 ++- enedisgateway2mqtt/Dockerfile | 3 ++- enedisgateway2mqtt_dev/Dockerfile | 3 ++- epicgamesfree/Dockerfile | 3 ++- filebrowser/Dockerfile | 3 ++- fireflyiii/Dockerfile | 3 ++- fireflyiii_data_importer/Dockerfile | 3 ++- fireflyiii_fints_importer/Dockerfile | 3 ++- flaresolverr/Dockerfile | 3 ++- flexget/Dockerfile | 3 ++- free_games_claimer/Dockerfile | 3 ++- gazpar2mqtt/Dockerfile | 3 ++- gitea/Dockerfile | 3 ++- grav/Dockerfile | 3 ++- guacamole/Dockerfile | 3 ++- immich/Dockerfile | 3 ++- inadyn/Dockerfile | 3 ++- jackett/Dockerfile | 3 ++- jellyfin/Dockerfile | 1 + jellyseerr/Dockerfile | 3 ++- joal/Dockerfile | 3 ++- joplin/Dockerfile | 3 ++- lidarr/Dockerfile | 3 ++- mealie/Dockerfile | 3 ++- mylar3/Dockerfile | 3 ++- nextcloud/Dockerfile | 3 ++- nzbget/Dockerfile | 3 ++- omada/Dockerfile | 3 ++- omada_v3/Dockerfile | 3 ++- ombi/Dockerfile | 3 ++- organizr/Dockerfile | 3 ++- overseerr/Dockerfile | 3 ++- paperless_ngx/Dockerfile | 3 ++- papermerge/Dockerfile | 3 ++- photoprism/Dockerfile | 3 ++- piwigo/Dockerfile | 3 ++- plex/Dockerfile | 3 ++- plex_meta_manager/Dockerfile | 3 ++- portainer/Dockerfile | 3 ++- portainer_agent/Dockerfile | 3 ++- postgres/Dockerfile | 3 ++- prowlarr/Dockerfile | 3 ++- qbittorrent/Dockerfile | 3 ++- radarr/Dockerfile | 3 ++- readarr/Dockerfile | 3 ++- requestrr/Dockerfile | 3 ++- resiliosync/Dockerfile | 3 ++- sabnzbd/Dockerfile | 3 ++- scrutiny/Dockerfile | 3 ++- scrutiny_fa/Dockerfile | 3 ++- seafile/Dockerfile | 3 ++- sonarr/Dockerfile | 3 ++- sponsorblockcast/Dockerfile | 6 ++++++ spotweb/Dockerfile | 3 ++- tandoor_recipes/Dockerfile | 3 ++- tdarr/Dockerfile | 3 ++- teamspeak/Dockerfile | 3 ++- transmission/Dockerfile | 3 ++- transmission_openvpn/Dockerfile | 3 ++- ubooquity/Dockerfile | 3 ++- unpackerr/Dockerfile | 3 ++- webtop_kde/Dockerfile | 1 + webtrees/Dockerfile | 3 ++- wger/Dockerfile | 9 +++++---- whoogle/Dockerfile | 3 ++- xteve/Dockerfile | 3 ++- zoneminder/Dockerfile | 3 ++- 81 files changed, 167 insertions(+), 81 deletions(-) diff --git a/addons_updater/Dockerfile b/addons_updater/Dockerfile index 650b99eeb..8ba512b66 100644 --- 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 ################## diff --git a/arpspoof/Dockerfile b/arpspoof/Dockerfile index 189c6b041..80a18cb98 100644 --- 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 # diff --git a/autobrr/Dockerfile b/autobrr/Dockerfile index 8ccfbd562..e35be4863 100644 --- 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" diff --git a/baikal/Dockerfile b/baikal/Dockerfile index 7a0d49f06..9652aa8de 100644 --- 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 diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile index 3833cf0d8..567f1fcf9 100644 --- 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" diff --git a/binance-trading-bot/Dockerfile b/binance-trading-bot/Dockerfile index bed711f9c..593a50534 100644 --- 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 # diff --git a/bitwarden/Dockerfile b/bitwarden/Dockerfile index 7525070ea..79d2427d8 100644 --- 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 # diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile index ffad0aec3..895ce0547 100644 --- 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" diff --git a/browserless_chrome/Dockerfile b/browserless_chrome/Dockerfile index 9ae43cadd..0f587f407 100644 --- 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 diff --git a/calibre/Dockerfile b/calibre/Dockerfile index 713931f26..9efbcee02 100644 --- 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" diff --git a/calibre_web/Dockerfile b/calibre_web/Dockerfile index 138615139..474f4089f 100644 --- 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 \ diff --git a/cloudcommander/Dockerfile b/cloudcommander/Dockerfile index 21535c3ec..9b58c8385 100644 --- 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 # diff --git a/code-server/Dockerfile b/code-server/Dockerfile index 0b886b5d0..2a77212fb 100644 --- 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" diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 7c4317e8e..bf97b1176 100644 --- 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 diff --git a/emby/Dockerfile b/emby/Dockerfile index d552e056b..e4dae0e82 100644 --- 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" diff --git a/enedisgateway2mqtt/Dockerfile b/enedisgateway2mqtt/Dockerfile index d0488a17f..0abbaaaab 100644 --- 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 # diff --git a/enedisgateway2mqtt_dev/Dockerfile b/enedisgateway2mqtt_dev/Dockerfile index 8d1c5536b..e60d1affe 100644 --- 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 # diff --git a/epicgamesfree/Dockerfile b/epicgamesfree/Dockerfile index 816468010..12ac8a170 100644 --- 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 diff --git a/filebrowser/Dockerfile b/filebrowser/Dockerfile index 126157d1b..0f56ceff1 100644 --- 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 # diff --git a/fireflyiii/Dockerfile b/fireflyiii/Dockerfile index 6f2f00d32..5889035e5 100644 --- 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 diff --git a/fireflyiii_data_importer/Dockerfile b/fireflyiii_data_importer/Dockerfile index 9ce35e94a..2cf059866 100644 --- 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 diff --git a/fireflyiii_fints_importer/Dockerfile b/fireflyiii_fints_importer/Dockerfile index 157bcf0cd..6fcf55710 100644 --- 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 # diff --git a/flaresolverr/Dockerfile b/flaresolverr/Dockerfile index 018a04743..f55f6df8a 100644 --- 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 diff --git a/flexget/Dockerfile b/flexget/Dockerfile index 5c49751a9..d8c50ccca 100644 --- 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"] diff --git a/free_games_claimer/Dockerfile b/free_games_claimer/Dockerfile index dd82e2a79..c7e3afc06 100644 --- 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 # diff --git a/gazpar2mqtt/Dockerfile b/gazpar2mqtt/Dockerfile index dda69fed8..9d31da1ad 100644 --- 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 diff --git a/gitea/Dockerfile b/gitea/Dockerfile index a24fd124b..16f3d58da 100644 --- 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 diff --git a/grav/Dockerfile b/grav/Dockerfile index 111ed728e..7ba00cc18 100644 --- 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" diff --git a/guacamole/Dockerfile b/guacamole/Dockerfile index 0ff02c4f3..e26fe7a25 100644 --- 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 diff --git a/immich/Dockerfile b/immich/Dockerfile index 5579c133f..1b6d3ea02 100644 --- 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" diff --git a/inadyn/Dockerfile b/inadyn/Dockerfile index 5514004c8..fbb7c0ca9 100644 --- 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'\ diff --git a/jackett/Dockerfile b/jackett/Dockerfile index 868f0b726..dca958bab 100644 --- 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" diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile index 65670b1da..49e94fee0 100644 --- 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 diff --git a/jellyseerr/Dockerfile b/jellyseerr/Dockerfile index 7aa84ab4d..72968642c 100644 --- 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" diff --git a/joal/Dockerfile b/joal/Dockerfile index 67bf6a7f4..5e3b12ffc 100644 --- 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 diff --git a/joplin/Dockerfile b/joplin/Dockerfile index 7d35f62ec..0efcc14e8 100644 --- 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 diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile index 4b29cb165..d08eec60d 100644 --- 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" diff --git a/mealie/Dockerfile b/mealie/Dockerfile index 04a109bbd..6728c4f6a 100644 --- 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 diff --git a/mylar3/Dockerfile b/mylar3/Dockerfile index a1811eb9c..e9ab87ec9 100644 --- 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" diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index 26c339878..d7d870971 100644 --- 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" diff --git a/nzbget/Dockerfile b/nzbget/Dockerfile index fc88ff992..370db74b2 100644 --- 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" diff --git a/omada/Dockerfile b/omada/Dockerfile index 5f901c8cf..dbdd914f9 100644 --- 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 \ diff --git a/omada_v3/Dockerfile b/omada_v3/Dockerfile index c3cc2a79b..7ce142303 100644 --- 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 \ diff --git a/ombi/Dockerfile b/ombi/Dockerfile index 79c73106a..01c1b8cf5 100644 --- 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" diff --git a/organizr/Dockerfile b/organizr/Dockerfile index 6e537b8f7..32caf2b3c 100644 --- 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" diff --git a/overseerr/Dockerfile b/overseerr/Dockerfile index ec70eea89..e09c29459 100644 --- 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" diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile index 3fd59316c..395d0b6fb 100644 --- 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 \ diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile index 6df893d42..f839f83d0 100644 --- 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 \ diff --git a/photoprism/Dockerfile b/photoprism/Dockerfile index 6e9945b0a..f805a7601 100644 --- 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" diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile index cd4893d58..991bd9550 100644 --- 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" diff --git a/plex/Dockerfile b/plex/Dockerfile index 2e4de854a..4196b1d99 100644 --- 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 diff --git a/plex_meta_manager/Dockerfile b/plex_meta_manager/Dockerfile index 4ceec83d8..f846b9e6c 100644 --- 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 diff --git a/portainer/Dockerfile b/portainer/Dockerfile index 28717ecbf..d24f84954 100644 --- 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"] diff --git a/portainer_agent/Dockerfile b/portainer_agent/Dockerfile index 57ad56257..9df9e922b 100644 --- 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 # diff --git a/postgres/Dockerfile b/postgres/Dockerfile index 8e55ac83a..a7c74f5c9 100644 --- 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 diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile index 99c5e4ce9..56c4ebd1c 100644 --- 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" diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile index 91008775c..6b1287dd5 100644 --- 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 \ diff --git a/radarr/Dockerfile b/radarr/Dockerfile index 6d8cb26da..de17f19e3 100644 --- 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" diff --git a/readarr/Dockerfile b/readarr/Dockerfile index 699e97caf..899a5e684 100644 --- 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" diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile index d4c5c8ee5..f07193541 100644 --- 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" diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile index 8002f2f7a..d249ca0d9 100644 --- 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 \ diff --git a/sabnzbd/Dockerfile b/sabnzbd/Dockerfile index d33a6bf8c..314cb21ff 100644 --- 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" diff --git a/scrutiny/Dockerfile b/scrutiny/Dockerfile index d70965e56..beb5d662f 100644 --- 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 # diff --git a/scrutiny_fa/Dockerfile b/scrutiny_fa/Dockerfile index d70965e56..beb5d662f 100644 --- 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 # diff --git a/seafile/Dockerfile b/seafile/Dockerfile index 4a04df360..0f6e3e258 100644 --- 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 diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile index 134b7a305..a7d0dc754 100644 --- 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" diff --git a/sponsorblockcast/Dockerfile b/sponsorblockcast/Dockerfile index ee3243202..bfc119cad 100644 --- 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 # ################## diff --git a/spotweb/Dockerfile b/spotweb/Dockerfile index 2f764e51d..986246714 100644 --- 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 diff --git a/tandoor_recipes/Dockerfile b/tandoor_recipes/Dockerfile index d39f67dcc..5ae0237c5 100644 --- 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 # diff --git a/tdarr/Dockerfile b/tdarr/Dockerfile index 83b73ca9e..2ee7525be 100644 --- 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 # diff --git a/teamspeak/Dockerfile b/teamspeak/Dockerfile index 96d4d50d6..3399b42b6 100644 --- 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 diff --git a/transmission/Dockerfile b/transmission/Dockerfile index a59770048..2b2566f63 100644 --- 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 diff --git a/transmission_openvpn/Dockerfile b/transmission_openvpn/Dockerfile index e1367e892..920d17576 100644 --- 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 \ diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile index 0f304aa61..106ccafc8 100644 --- 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 diff --git a/unpackerr/Dockerfile b/unpackerr/Dockerfile index d33cdc40b..2d8912c96 100644 --- 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" diff --git a/webtop_kde/Dockerfile b/webtop_kde/Dockerfile index eea1813cf..a177d209e 100644 --- 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 diff --git a/webtrees/Dockerfile b/webtrees/Dockerfile index f486bc893..8b225eede 100644 --- 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" diff --git a/wger/Dockerfile b/wger/Dockerfile index b369da130..f457ecb85 100644 --- 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 ' \ DJANGO_MEDIA_ROOT="/data/media" \ diff --git a/whoogle/Dockerfile b/whoogle/Dockerfile index af58f98b8..4e9b2a434 100644 --- 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 diff --git a/xteve/Dockerfile b/xteve/Dockerfile index 5afa5d413..e33a03962 100644 --- 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 diff --git a/zoneminder/Dockerfile b/zoneminder/Dockerfile index 92d50671b..95f7fd13f 100644 --- 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