From 224940b248ec7857e37416230a233c200e7caba1 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Tue, 14 Jun 2022 07:53:07 +0200 Subject: [PATCH] Implement s6 maxtime --- addons_updater/Dockerfile | 4 ++++ arpspoof/Dockerfile | 4 ++++ bazarr/Dockerfile | 4 ++++ bitwarden/Dockerfile | 4 ++++ booksonic_air/Dockerfile | 4 ++++ calibre/Dockerfile | 4 ++++ calibre_web/Dockerfile | 4 ++++ cloudcommander/Dockerfile | 4 ++++ code-server/Dockerfile | 4 ++++ elasticsearch/Dockerfile | 4 ++++ emby/Dockerfile | 8 ++++---- enedisgateway2mqtt/Dockerfile | 4 ++++ enedisgateway2mqtt_dev/Dockerfile | 4 ++++ filebrowser/Dockerfile | 4 ++++ fireflyiii/Dockerfile | 4 ++++ fireflyiii_data_importer/Dockerfile | 4 ++++ fireflyiii_fints_importer/Dockerfile | 4 ++++ flaresolverr/Dockerfile | 4 ++++ flexget/Dockerfile | 4 ++++ gazpar2mqtt/Dockerfile | 4 ++++ grav/Dockerfile | 4 ++++ guacamole/Dockerfile | 4 ++++ inadyn/Dockerfile | 4 ++++ jackett/Dockerfile | 4 ++++ jellyfin/Dockerfile | 4 ++++ joal/Dockerfile | 4 ++++ joplin/Dockerfile | 4 ++++ lidarr/Dockerfile | 4 ++++ mealie/Dockerfile | 4 ++++ mylar3/Dockerfile | 4 ++++ nextcloud/Dockerfile | 4 ++++ nzbget/Dockerfile | 4 ++++ omada/Dockerfile | 4 ++++ ombi/Dockerfile | 4 ++++ organizr/Dockerfile | 4 ++++ overseerr/Dockerfile | 4 ++++ paperless_ngx/Dockerfile | 4 ++++ papermerge/Dockerfile | 4 ++++ photoprism/Dockerfile | 4 ++++ piwigo/Dockerfile | 4 ++++ plex/Dockerfile | 4 ++++ plex_meta_manager/Dockerfile | 4 ++++ portainer/Dockerfile | 4 ++++ prowlarr/Dockerfile | 4 ++++ qbittorrent/Dockerfile | 4 ++++ radarr/Dockerfile | 4 ++++ readarr/Dockerfile | 4 ++++ requestrr/Dockerfile | 4 ++++ resiliosync/Dockerfile | 4 ++++ scrutiny/Dockerfile | 4 ++++ scrutiny_fa/Dockerfile | 4 ++++ seafile/Dockerfile | 4 ++++ sonarr/Dockerfile | 4 ++++ spotweb/Dockerfile | 4 ++++ tandoor_recipes/Dockerfile | 4 ++++ tdarr/Dockerfile | 4 ++++ teamspeak/Dockerfile | 4 ++++ transmission/Dockerfile | 4 ++++ transmission_openvpn/Dockerfile | 4 ++++ ubooquity/Dockerfile | 4 ++++ unpackerr/Dockerfile | 4 ++++ webtop_kde/Dockerfile | 4 ++++ webtrees/Dockerfile | 4 ++++ wger/Dockerfile | 4 ++++ whoogle/Dockerfile | 4 ++++ xteve/Dockerfile | 4 ++++ zoneminder/Dockerfile | 4 ++++ 67 files changed, 268 insertions(+), 4 deletions(-) diff --git a/addons_updater/Dockerfile b/addons_updater/Dockerfile index 0ba15e4e8..b6eb4284a 100644 --- a/addons_updater/Dockerfile +++ b/addons_updater/Dockerfile @@ -22,6 +22,10 @@ VOLUME [ "/data" ] # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + ################## # 3 Install apps # diff --git a/arpspoof/Dockerfile b/arpspoof/Dockerfile index e1311e74b..f7661b52a 100644 --- a/arpspoof/Dockerfile +++ b/arpspoof/Dockerfile @@ -22,6 +22,10 @@ FROM $BUILD_FROM # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + ################## # 3 Install apps # ################## diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile index efece43cf..87d019948 100644 --- a/bazarr/Dockerfile +++ b/bazarr/Dockerfile @@ -22,6 +22,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN \ # Correct config folder diff --git a/bitwarden/Dockerfile b/bitwarden/Dockerfile index ee633db1c..819202ac7 100644 --- a/bitwarden/Dockerfile +++ b/bitwarden/Dockerfile @@ -30,6 +30,10 @@ COPY --from=vaultwarden /web-vault /opt/web-vault # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + ################## # 3 Install apps # ################## diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile index 64fcedae2..cc23d3ec4 100644 --- a/booksonic_air/Dockerfile +++ b/booksonic_air/Dockerfile @@ -22,6 +22,10 @@ FROM $BUILD_FROM # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + ENV BOOKSONIC_AIR_SETTINGS="/data" RUN \ # Allow UID and GID setting diff --git a/calibre/Dockerfile b/calibre/Dockerfile index fb59cb35b..cbab6d031 100644 --- a/calibre/Dockerfile +++ b/calibre/Dockerfile @@ -23,6 +23,10 @@ ENV BASHIO_VERSION=1.29.1 # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + # Allow UID and GID setting RUN sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ diff --git a/calibre_web/Dockerfile b/calibre_web/Dockerfile index 65b85a218..8349ebc75 100644 --- a/calibre_web/Dockerfile +++ b/calibre_web/Dockerfile @@ -23,6 +23,10 @@ ENV BASHIO_VERSION=1.29.1 # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + # Allow UID and GID setting RUN sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ diff --git a/cloudcommander/Dockerfile b/cloudcommander/Dockerfile index 10c512331..39d571589 100644 --- a/cloudcommander/Dockerfile +++ b/cloudcommander/Dockerfile @@ -21,6 +21,10 @@ FROM coderaiser/cloudcmd:latest # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + ################## # 3 Install apps # ################## diff --git a/code-server/Dockerfile b/code-server/Dockerfile index 0e570d5d5..b2fb628ca 100644 --- a/code-server/Dockerfile +++ b/code-server/Dockerfile @@ -22,6 +22,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + RUN \ # Allow UID and GID setting sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index b81858fad..1555b1c8d 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -21,6 +21,10 @@ FROM elasticsearch:$BUILD_UPSTREAM # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + # Data persistence # hadolint ignore=SC2016 RUN sed -i '5a echo "Data location moved. Please wait while elasticsearch starts..."' /usr/local/bin/docker-entrypoint.sh \ diff --git a/emby/Dockerfile b/emby/Dockerfile index d9ef08493..5e1e227e9 100644 --- a/emby/Dockerfile +++ b/emby/Dockerfile @@ -22,12 +22,13 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + # Set shell SHELL ["/bin/bash", "-o", "pipefail", "-c"] -ENV S6_CMD_WAIT_FOR_SERVICES=1 \ - S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 - RUN \ # Allow UID and GID setting sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ @@ -38,7 +39,6 @@ RUN \ # FOLDERS && sed -i "s|/config|/emby|g" /etc/services.d/emby/run \ && sed -i "s|/config|/emby|g" /etc/cont-init.d/30-config - #&& sed -i 's/bash/bashio/g' /etc/cont-init.d/40* ################## # 3 Install apps # diff --git a/enedisgateway2mqtt/Dockerfile b/enedisgateway2mqtt/Dockerfile index 39d55835b..463d11129 100644 --- a/enedisgateway2mqtt/Dockerfile +++ b/enedisgateway2mqtt/Dockerfile @@ -22,6 +22,10 @@ FROM m4dm4rtig4n/enedisgateway2mqtt:$BUILD_UPSTREAM # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + ################## # 3 Install apps # ################## diff --git a/enedisgateway2mqtt_dev/Dockerfile b/enedisgateway2mqtt_dev/Dockerfile index ff61a071e..718b2bae1 100644 --- a/enedisgateway2mqtt_dev/Dockerfile +++ b/enedisgateway2mqtt_dev/Dockerfile @@ -22,6 +22,10 @@ FROM m4dm4rtig4n/enedisgateway2mqtt:$BUILD_UPSTREAM # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + ################## # 3 Install apps # ################## diff --git a/filebrowser/Dockerfile b/filebrowser/Dockerfile index 257e5f51e..da682cc4f 100644 --- a/filebrowser/Dockerfile +++ b/filebrowser/Dockerfile @@ -22,6 +22,10 @@ FROM hurlenko/filebrowser:v${BUILD_UPSTREAM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + ################## # 3 Install apps # diff --git a/fireflyiii/Dockerfile b/fireflyiii/Dockerfile index 2575d6aca..357b3a7c8 100644 --- a/fireflyiii/Dockerfile +++ b/fireflyiii/Dockerfile @@ -22,6 +22,10 @@ FROM fireflyiii/core:latest # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + #ENV FIREFLY_III_PATH="/data/firefly" #WORKDIR $FIREFLY_III_PATH #RUN \ diff --git a/fireflyiii_data_importer/Dockerfile b/fireflyiii_data_importer/Dockerfile index c1f48627a..39965fc76 100644 --- a/fireflyiii_data_importer/Dockerfile +++ b/fireflyiii_data_importer/Dockerfile @@ -23,6 +23,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + #ENV FIREFLY_III_PATH="/data/firefly" #WORKDIR $FIREFLY_III_PATH #RUN \ diff --git a/fireflyiii_fints_importer/Dockerfile b/fireflyiii_fints_importer/Dockerfile index d55ca8c7e..15a323ed0 100644 --- a/fireflyiii_fints_importer/Dockerfile +++ b/fireflyiii_fints_importer/Dockerfile @@ -23,6 +23,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + ################## # 3 Install apps # diff --git a/flaresolverr/Dockerfile b/flaresolverr/Dockerfile index 27e9de367..547d8185a 100644 --- a/flaresolverr/Dockerfile +++ b/flaresolverr/Dockerfile @@ -21,6 +21,10 @@ FROM flaresolverr/flaresolverr:latest # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + USER root ################## diff --git a/flexget/Dockerfile b/flexget/Dockerfile index c55906161..26d6e4d7e 100644 --- a/flexget/Dockerfile +++ b/flexget/Dockerfile @@ -22,6 +22,10 @@ FROM wiserain/flexget:latest # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + SHELL ["/bin/bash", "-o", "pipefail", "-c"] # hadolint ignore=SC2016 diff --git a/gazpar2mqtt/Dockerfile b/gazpar2mqtt/Dockerfile index 050060dd1..efc6d42d9 100644 --- a/gazpar2mqtt/Dockerfile +++ b/gazpar2mqtt/Dockerfile @@ -22,6 +22,10 @@ FROM yukulehe/gazpar2mqtt:$BUILD_UPSTREAM # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + ENV TZ=Europe/Paris ################## diff --git a/grav/Dockerfile b/grav/Dockerfile index 5c2ad7edd..46e20c8b6 100644 --- a/grav/Dockerfile +++ b/grav/Dockerfile @@ -22,6 +22,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + RUN \ # use /data instead of /config for hass.io environment sed -i "s|/config|/share/grav|g" /etc/cont-init.d/50-config \ diff --git a/guacamole/Dockerfile b/guacamole/Dockerfile index 614b74fec..867a3ed96 100644 --- a/guacamole/Dockerfile +++ b/guacamole/Dockerfile @@ -22,6 +22,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + ENV PGDATA=/config/addons_config/guacamole/postgres ENV GUACAMOLE_HOME=/config/addons_config/guacamole WORKDIR /config/addons_config/guacamole diff --git a/inadyn/Dockerfile b/inadyn/Dockerfile index 736aeb2f1..13a29772b 100644 --- a/inadyn/Dockerfile +++ b/inadyn/Dockerfile @@ -20,6 +20,10 @@ FROM troglobit/inadyn:latest # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + ARG BUILD_ARCH ENV LANG='C.UTF-8'\ TERM='xterm-256color'\ diff --git a/jackett/Dockerfile b/jackett/Dockerfile index 2e39a9f45..61ed38975 100644 --- a/jackett/Dockerfile +++ b/jackett/Dockerfile @@ -22,6 +22,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + # use /data instead of /config for hass.io environment RUN sed -i "s|/config|/config/addons_config/Jackett|g" /etc/cont-init.d/30-config \ \ diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile index 6ad3aefd8..84dfb1714 100644 --- a/jellyfin/Dockerfile +++ b/jellyfin/Dockerfile @@ -22,6 +22,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + # Allow UID and GID setting RUN \ sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ diff --git a/joal/Dockerfile b/joal/Dockerfile index fbc61a006..2ea3a4a07 100644 --- a/joal/Dockerfile +++ b/joal/Dockerfile @@ -23,6 +23,10 @@ FROM anthonyraymond/joal:$BUILD_UPSTREAM # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + # Install Joal # spellcheck disable=SC2015 # hadolint ignore=SC2015,DL4006 diff --git a/joplin/Dockerfile b/joplin/Dockerfile index 8d869f114..6819a1198 100644 --- a/joplin/Dockerfile +++ b/joplin/Dockerfile @@ -21,6 +21,10 @@ FROM florider89/joplin-server:latest # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + USER root # Prevent curl issue diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile index fdd2ed4a6..fd22ebc6b 100644 --- a/lidarr/Dockerfile +++ b/lidarr/Dockerfile @@ -22,6 +22,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + RUN \ # use /data instead of /config for hass.io environment sed -i "s|/config|/config/addons_config/lidarr|g" /etc/services.d/lidarr/run \ diff --git a/mealie/Dockerfile b/mealie/Dockerfile index 9d865550e..f22e4f066 100644 --- a/mealie/Dockerfile +++ b/mealie/Dockerfile @@ -22,6 +22,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + # Correct data path # hadolint ignore=DL4006 RUN grep -rl "/app/data" /app | xargs sed -i 's|/app/data|/data|g' diff --git a/mylar3/Dockerfile b/mylar3/Dockerfile index 9d199cf18..b6f17a16b 100644 --- a/mylar3/Dockerfile +++ b/mylar3/Dockerfile @@ -22,6 +22,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + RUN sed -i "s|/config|/data|g" /etc/services.d/*/run \ && sed -i "s|/config|/data|g" /etc/cont-init.d/* \ \ diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index 4bf1c5df1..99b210930 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -24,6 +24,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + ENV NEXTCLOUD_PATH="/data/config/www/nextcloud" RUN \ diff --git a/nzbget/Dockerfile b/nzbget/Dockerfile index 9038e64bc..80ee492be 100644 --- a/nzbget/Dockerfile +++ b/nzbget/Dockerfile @@ -22,6 +22,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + RUN sed -i "s|/config|/config/addons_config/nzbget|g" /etc/services.d/nzbget/run \ && sed -i "s|/config|/config/addons_config/nzbget|g" /etc/cont-init.d/30-config \ && sed -i "s|/config|/config/addons_config/nzbget|g" /etc/cont-init.d/10-adduser \ diff --git a/omada/Dockerfile b/omada/Dockerfile index 99799777d..45bf43d80 100644 --- a/omada/Dockerfile +++ b/omada/Dockerfile @@ -23,6 +23,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + RUN echo "Adding symlinks to entrypoint" \ && sed -i \ -e '1a chmod a+x /etc/cont-init.d/*' \ diff --git a/ombi/Dockerfile b/ombi/Dockerfile index 338fc6f78..e639bcd06 100644 --- a/ombi/Dockerfile +++ b/ombi/Dockerfile @@ -22,6 +22,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + # spellcheck disable=SC2015 # hadolint ignore=SC2015,DL4006 RUN \ diff --git a/organizr/Dockerfile b/organizr/Dockerfile index fcd13fd88..4f6e8cbe7 100644 --- a/organizr/Dockerfile +++ b/organizr/Dockerfile @@ -21,6 +21,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + # hadolint ignore=DL4006 RUN \ ######################################## diff --git a/overseerr/Dockerfile b/overseerr/Dockerfile index 2e3d3a628..0931fa89c 100644 --- a/overseerr/Dockerfile +++ b/overseerr/Dockerfile @@ -23,6 +23,10 @@ ENV BASHIO_VERSION=1.29.1 # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + RUN sed -i "s|/config|/config/addons_config/addons_config/overseerr|g" /etc/services.d/overseerr/run \ && sed -i "s|/config|/config/addons_config/addons_config/overseerr|g" /etc/cont-init.d/30-config \ \ diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile index 5741c756b..d587d55d2 100644 --- a/paperless_ngx/Dockerfile +++ b/paperless_ngx/Dockerfile @@ -22,6 +22,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + ENV PAPERLESS_DATA_DIR=/config/addons_config/paperless_ng # spellcheck disable=SC2015 # hadolint ignore=SC2015 diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile index c6977dcaf..80926fa4a 100644 --- a/papermerge/Dockerfile +++ b/papermerge/Dockerfile @@ -22,6 +22,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + # hadolint ignore=SC2015 RUN \ # Allow UID and GID setting diff --git a/photoprism/Dockerfile b/photoprism/Dockerfile index b45e01508..3ea4bea8f 100644 --- a/photoprism/Dockerfile +++ b/photoprism/Dockerfile @@ -23,6 +23,10 @@ FROM photoprism/photoprism:latest # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + RUN \ # Create directories mkdir -p \ diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile index 770f37fa3..7f0208280 100644 --- a/piwigo/Dockerfile +++ b/piwigo/Dockerfile @@ -22,6 +22,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + RUN \ # Allow UID and GID setting sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ diff --git a/plex/Dockerfile b/plex/Dockerfile index e1f969e7e..5e8a2bd07 100644 --- a/plex/Dockerfile +++ b/plex/Dockerfile @@ -22,6 +22,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + # Set shell SHELL ["/bin/bash", "-o", "pipefail", "-c"] diff --git a/plex_meta_manager/Dockerfile b/plex_meta_manager/Dockerfile index b88648fc0..ba16fd3a4 100644 --- a/plex_meta_manager/Dockerfile +++ b/plex_meta_manager/Dockerfile @@ -22,6 +22,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + ENV HOME=/config/addons_config/plex-data-manager RUN \ diff --git a/portainer/Dockerfile b/portainer/Dockerfile index e707dcccc..6e0b3f4ba 100644 --- a/portainer/Dockerfile +++ b/portainer/Dockerfile @@ -21,6 +21,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + # Set shell SHELL ["/bin/bash", "-o", "pipefail", "-c"] diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile index 19cf3c434..67ed4849b 100644 --- a/prowlarr/Dockerfile +++ b/prowlarr/Dockerfile @@ -22,6 +22,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + RUN \ # Allow UID and GID setting sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile index abd199ec3..0698ee7ab 100644 --- a/qbittorrent/Dockerfile +++ b/qbittorrent/Dockerfile @@ -23,6 +23,10 @@ FROM ${BUILD_FROM}-$BUILD_UPSTREAM # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + # Environment variables ENV \ DEBIAN_FRONTEND="noninteractive"\ diff --git a/radarr/Dockerfile b/radarr/Dockerfile index c17a05124..2c4b03419 100644 --- a/radarr/Dockerfile +++ b/radarr/Dockerfile @@ -22,6 +22,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + RUN \ # use /data instead of /config for hass.io environment sed -i "s|/config|/config/addons_config/radarr|g" /etc/services.d/radarr/run \ diff --git a/readarr/Dockerfile b/readarr/Dockerfile index 73abe59c1..da129c4a1 100644 --- a/readarr/Dockerfile +++ b/readarr/Dockerfile @@ -23,6 +23,10 @@ ENV BASHIO_VERSION=0.14.3 # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + RUN sed -i "s|/config|/config/addons_config/radarr/readarr|g" /etc/services.d/readarr/run \ && sed -i "s|/config|/config/addons_config/radarr/readarr|g" /etc/cont-init.d/30-config \ \ diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile index b5241e61c..9d96501e0 100644 --- a/requestrr/Dockerfile +++ b/requestrr/Dockerfile @@ -22,6 +22,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + RUN \ # use /data instead of /config for hass.io environment sed -i "s|/config|/data|g" /etc/services.d/requestrr/run \ diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile index f8761f9f0..6016f0409 100644 --- a/resiliosync/Dockerfile +++ b/resiliosync/Dockerfile @@ -23,6 +23,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + # hadolint ignore=DL4006 RUN \ ############### diff --git a/scrutiny/Dockerfile b/scrutiny/Dockerfile index df9d00764..9e6aefab5 100644 --- a/scrutiny/Dockerfile +++ b/scrutiny/Dockerfile @@ -24,6 +24,10 @@ FROM ${BUILD_FROM}${BUILD_UPSTREAM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + # hadolint ignore=DL4006 RUN \ # Allow UID and GID setting diff --git a/scrutiny_fa/Dockerfile b/scrutiny_fa/Dockerfile index 053be75fc..b27f00fcd 100644 --- a/scrutiny_fa/Dockerfile +++ b/scrutiny_fa/Dockerfile @@ -23,6 +23,10 @@ FROM ${BUILD_FROM}${BUILD_UPSTREAM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + # hadolint ignore=DL4006 RUN \ # Allow UID and GID setting diff --git a/seafile/Dockerfile b/seafile/Dockerfile index b38bd7554..8096fa295 100644 --- a/seafile/Dockerfile +++ b/seafile/Dockerfile @@ -23,6 +23,10 @@ ENV BASHIO_VERSION=1.29.1 # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + ENV LANG C.UTF-8 ################## diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile index 8b5ae456c..268443362 100644 --- a/sonarr/Dockerfile +++ b/sonarr/Dockerfile @@ -23,6 +23,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + RUN \ # use /data instead of /config for hass.io environment sed -i "s|/config|/config/addons_config/sonarr|g" /etc/services.d/sonarr/run \ diff --git a/spotweb/Dockerfile b/spotweb/Dockerfile index b72aeffdf..2edfee592 100644 --- a/spotweb/Dockerfile +++ b/spotweb/Dockerfile @@ -22,6 +22,10 @@ FROM $BUILD_FROM # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + ENV LANG C.UTF-8 # Environment variables diff --git a/tandoor_recipes/Dockerfile b/tandoor_recipes/Dockerfile index 92ba27e2b..8e6af243f 100644 --- a/tandoor_recipes/Dockerfile +++ b/tandoor_recipes/Dockerfile @@ -22,6 +22,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + ################## # 3 Install apps # diff --git a/tdarr/Dockerfile b/tdarr/Dockerfile index 06262f522..127da5242 100644 --- a/tdarr/Dockerfile +++ b/tdarr/Dockerfile @@ -22,6 +22,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + ################## # 3 Install apps # ################## diff --git a/teamspeak/Dockerfile b/teamspeak/Dockerfile index 3aa3fb235..f527ab7c7 100644 --- a/teamspeak/Dockerfile +++ b/teamspeak/Dockerfile @@ -21,6 +21,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + RUN mkdir -p /data \ && chown -R 503:503 /data diff --git a/transmission/Dockerfile b/transmission/Dockerfile index acd74955b..e09e92021 100644 --- a/transmission/Dockerfile +++ b/transmission/Dockerfile @@ -22,6 +22,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + # MOFIFY DATA PATH RUN sed -i "s|config|config/transmission|g" /etc/services.d/transmission/run \ #&& sed -i "s|config|config/transmission|g" /etc/cont-init.d/20-config \ diff --git a/transmission_openvpn/Dockerfile b/transmission_openvpn/Dockerfile index 9de647574..62e60ce38 100644 --- a/transmission_openvpn/Dockerfile +++ b/transmission_openvpn/Dockerfile @@ -23,6 +23,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + # MOFIFY DATA PATH ENV CREATE_TUN_DEVICE=false diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile index 7822d07d1..a41d85618 100644 --- a/ubooquity/Dockerfile +++ b/ubooquity/Dockerfile @@ -23,6 +23,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + RUN \ # Set config directory sed -i 's|config|config/ubooquity|g' /etc/cont-init.d/10-adduser \ diff --git a/unpackerr/Dockerfile b/unpackerr/Dockerfile index 1c7161210..ae366c509 100644 --- a/unpackerr/Dockerfile +++ b/unpackerr/Dockerfile @@ -22,6 +22,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + ################## # 3 Install apps # ################## diff --git a/webtop_kde/Dockerfile b/webtop_kde/Dockerfile index 11dcc4bcb..b2e275a6d 100644 --- a/webtop_kde/Dockerfile +++ b/webtop_kde/Dockerfile @@ -22,6 +22,10 @@ FROM ${BUILD_FROM}alpine-kde # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + # Allow UID and GID setting RUN sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ diff --git a/webtrees/Dockerfile b/webtrees/Dockerfile index 970088b15..e1fb29f4e 100644 --- a/webtrees/Dockerfile +++ b/webtrees/Dockerfile @@ -22,6 +22,10 @@ FROM nathanvaughn/webtrees:latest # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + # Global variables ENV WEBTREES_HOME="/data/webtrees" WORKDIR $WEBTREES_HOME diff --git a/wger/Dockerfile b/wger/Dockerfile index 11b900ae7..9b527c817 100644 --- a/wger/Dockerfile +++ b/wger/Dockerfile @@ -21,6 +21,10 @@ FROM wger/devel:latest # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + VOLUME [ "/data" ] #USER root diff --git a/whoogle/Dockerfile b/whoogle/Dockerfile index 023192926..5f6d8b19a 100644 --- a/whoogle/Dockerfile +++ b/whoogle/Dockerfile @@ -22,6 +22,10 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + USER root ################## diff --git a/xteve/Dockerfile b/xteve/Dockerfile index 76c28c566..a1e991f35 100644 --- a/xteve/Dockerfile +++ b/xteve/Dockerfile @@ -23,6 +23,10 @@ FROM $BUILD_FROM # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + USER root RUN cp -vnpr /etc/opt/xteve* /data || true diff --git a/zoneminder/Dockerfile b/zoneminder/Dockerfile index dc4379f81..2c45bf6d7 100644 --- a/zoneminder/Dockerfile +++ b/zoneminder/Dockerfile @@ -23,6 +23,10 @@ FROM tritruongtr/zoneminder:latest # 2 Modify Image # ################## +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000 + # Change config location # hadolint ignore=DL4006 RUN sed -i 's|/etc/zm.conf|/config/addons_config/zoneminder/zm.conf|g' /usr/local/bin/entrypoint.sh \