From e762b8584779f255be8ca3bdecefb14a60547ce3 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 5 Sep 2023 18:23:50 +0200 Subject: [PATCH] ha_entrypoint --- .templates/00-aaa_dockerfile_backup.sh | 26 +++++++++---------- .../{entrypoint.sh => ha_entrypoint.sh} | 0 addons_updater/Dockerfile | 6 ++--- arpspoof/Dockerfile | 6 ++--- autobrr/Dockerfile | 5 ++-- baikal/Dockerfile | 6 ++--- bazarr/Dockerfile | 4 +-- binance-trading-bot/Dockerfile | 6 ++--- bitwarden/Dockerfile | 6 ++--- booksonic_air/Dockerfile | 6 ++--- browserless_chrome/Dockerfile | 6 ++--- calibre/Dockerfile | 6 ++--- calibre_web/Dockerfile | 6 ++--- cloudcommander/Dockerfile | 6 ++--- code-server/Dockerfile | 6 ++--- elasticsearch/Dockerfile | 4 +-- emby/Dockerfile | 4 +-- enedisgateway2mqtt/Dockerfile | 6 ++--- enedisgateway2mqtt_dev/Dockerfile | 6 ++--- epicgamesfree/Dockerfile | 8 +++--- filebrowser/Dockerfile | 6 ++--- fireflyiii/Dockerfile | 6 ++--- fireflyiii_data_importer/Dockerfile | 6 ++--- fireflyiii_fints_importer/Dockerfile | 6 ++--- flaresolverr/Dockerfile | 6 ++--- flexget/Dockerfile | 6 ++--- free_games_claimer/Dockerfile | 4 +-- gazpar2mqtt/Dockerfile | 6 ++--- gitea/Dockerfile | 6 ++--- grav/Dockerfile | 4 +-- guacamole/Dockerfile | 6 ++--- immich/Dockerfile | 6 ++--- inadyn/Dockerfile | 6 ++--- jackett/Dockerfile | 4 +-- jellyfin/Dockerfile | 6 ++--- jellyseerr/Dockerfile | 6 ++--- joal/Dockerfile | 6 ++--- joplin/Dockerfile | 6 ++--- lidarr/Dockerfile | 6 ++--- mealie/Dockerfile | 4 +-- mylar3/Dockerfile | 6 ++--- nextcloud/Dockerfile | 4 +-- nzbget/Dockerfile | 6 ++--- omada/Dockerfile | 6 ++--- omada_v3/Dockerfile | 6 ++--- ombi/Dockerfile | 6 ++--- organizr/Dockerfile | 4 +-- overseerr/Dockerfile | 6 ++--- paperless_ngx/Dockerfile | 8 +++--- papermerge/Dockerfile | 6 ++--- photoprism/Dockerfile | 6 ++--- piwigo/Dockerfile | 6 ++--- plex/Dockerfile | 6 ++--- plex_meta_manager/Dockerfile | 6 ++--- portainer/Dockerfile | 6 ++--- portainer_agent/Dockerfile | 4 +-- postgres/Dockerfile | 6 ++--- prowlarr/Dockerfile | 6 ++--- qbittorrent/Dockerfile | 4 +-- radarr/Dockerfile | 6 ++--- readarr/Dockerfile | 6 ++--- requestrr/Dockerfile | 6 ++--- resiliosync/Dockerfile | 6 ++--- sabnzbd/Dockerfile | 6 ++--- scrutiny/Dockerfile | 4 +-- scrutiny_fa/Dockerfile | 4 +-- seafile/Dockerfile | 6 ++--- sonarr/Dockerfile | 6 ++--- sponsorblockcast/Dockerfile | 6 ++--- spotweb/Dockerfile | 4 +-- tandoor_recipes/Dockerfile | 6 ++--- tdarr/Dockerfile | 4 +-- teamspeak/Dockerfile | 6 ++--- transmission/Dockerfile | 6 ++--- transmission_openvpn/Dockerfile | 6 ++--- ubooquity/Dockerfile | 6 ++--- unpackerr/Dockerfile | 4 +-- webtop_kde/Dockerfile | 6 ++--- webtrees/Dockerfile | 6 ++--- wger/Dockerfile | 8 +++--- whoogle/Dockerfile | 6 ++--- xteve/Dockerfile | 6 ++--- zoneminder/Dockerfile | 6 ++--- 83 files changed, 242 insertions(+), 243 deletions(-) rename .templates/{entrypoint.sh => ha_entrypoint.sh} (100%) diff --git a/.templates/00-aaa_dockerfile_backup.sh b/.templates/00-aaa_dockerfile_backup.sh index b983e4efc..b83415148 100755 --- a/.templates/00-aaa_dockerfile_backup.sh +++ b/.templates/00-aaa_dockerfile_backup.sh @@ -10,12 +10,12 @@ if [ -e "/MODULESFILE" ]; then MODULES="${MODULES:-00-banner.sh}" echo "Executing modules script : $MODULES" - if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d + if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi && + if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi && + apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true && + mkdir -p /etc/cont-init.d && + for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done && + chmod -R 755 /etc/cont-init.d fi ####################### @@ -25,15 +25,15 @@ if [ -e "/ENVFILE" ]; then PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh + if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi && + if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi && + curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh && + chmod 777 /automatic_packages.sh && + eval /./automatic_packages.sh "${PACKAGES:-}" && + rm /automatic_packages.sh fi -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then +if [ -e "/MODULESFILE" ] && [ ! -f /ha_entrypoint.sh ]; then for scripts in $MODULES; do echo "$scripts : executing" chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" diff --git a/.templates/entrypoint.sh b/.templates/ha_entrypoint.sh similarity index 100% rename from .templates/entrypoint.sh rename to .templates/ha_entrypoint.sh diff --git a/addons_updater/Dockerfile b/addons_updater/Dockerfile index 9dafac9a3..650b99eeb 100644 --- a/addons_updater/Dockerfile +++ b/addons_updater/Dockerfile @@ -63,15 +63,15 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi # Entrypoint logic -RUN chmod 777 /entrypoint.sh + #WORKDIR / ENTRYPOINT [ "/usr/bin/env" ] CMD [ "/ha_entrypoint.sh" ] diff --git a/arpspoof/Dockerfile b/arpspoof/Dockerfile index 6e3df3121..189c6b041 100644 --- a/arpspoof/Dockerfile +++ b/arpspoof/Dockerfile @@ -63,14 +63,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi + -RUN chmod 777 /entrypoint.sh ENTRYPOINT [ "/usr/bin/env" ] CMD [ "/ha_entrypoint.sh" ] diff --git a/autobrr/Dockerfile b/autobrr/Dockerfile index 7eb54e00b..8ccfbd562 100644 --- a/autobrr/Dockerfile +++ b/autobrr/Dockerfile @@ -91,14 +91,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -RUN chmod 777 /entrypoint.sh #WORKDIR / ENTRYPOINT [ "/usr/bin/env" ] CMD [ "/ha_entrypoint.sh" ] diff --git a/baikal/Dockerfile b/baikal/Dockerfile index aa29d26f2..7a0d49f06 100644 --- a/baikal/Dockerfile +++ b/baikal/Dockerfile @@ -67,15 +67,15 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi WORKDIR "/data" -RUN chmod 777 /entrypoint.sh + ENTRYPOINT [ "/usr/bin/env" ] CMD [ "/ha_entrypoint.sh" ] diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile index 6d0b7895e..3833cf0d8 100644 --- a/bazarr/Dockerfile +++ b/bazarr/Dockerfile @@ -88,12 +88,12 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi ############ # 5 Labels # diff --git a/binance-trading-bot/Dockerfile b/binance-trading-bot/Dockerfile index 230995e0b..bed711f9c 100644 --- a/binance-trading-bot/Dockerfile +++ b/binance-trading-bot/Dockerfile @@ -83,16 +83,16 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi VOLUME [ "/data" ] WORKDIR / -RUN chmod 777 /entrypoint.sh + ENTRYPOINT [ "/usr/bin/env" ] CMD [ "/ha_entrypoint.sh" ] diff --git a/bitwarden/Dockerfile b/bitwarden/Dockerfile index e2de69c0c..7525070ea 100644 --- a/bitwarden/Dockerfile +++ b/bitwarden/Dockerfile @@ -73,16 +73,16 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi RUN chmod 777 /etc/services.d/*/* -#RUN chmod 777 /entrypoint.sh +# #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile index 89e902e08..ffad0aec3 100644 --- a/booksonic_air/Dockerfile +++ b/booksonic_air/Dockerfile @@ -93,14 +93,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -#RUN chmod 777 /entrypoint.sh +# #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/browserless_chrome/Dockerfile b/browserless_chrome/Dockerfile index 58ba58a69..9ae43cadd 100644 --- a/browserless_chrome/Dockerfile +++ b/browserless_chrome/Dockerfile @@ -30,7 +30,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ USER root -RUN sed -i "2a /./entrypoint.sh" start.sh +RUN sed -i "2a /./ha_entrypoint.sh" start.sh ################## # 3 Install apps # @@ -67,12 +67,12 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi ############ # 5 Labels # diff --git a/calibre/Dockerfile b/calibre/Dockerfile index 78dd43913..713931f26 100644 --- a/calibre/Dockerfile +++ b/calibre/Dockerfile @@ -94,14 +94,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -#RUN chmod 777 /entrypoint.sh +# #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/calibre_web/Dockerfile b/calibre_web/Dockerfile index 7364fa633..138615139 100644 --- a/calibre_web/Dockerfile +++ b/calibre_web/Dockerfile @@ -102,14 +102,14 @@ RUN if ! command -v sqlite3 >/dev/null 2>/dev/null; then (apt-get update && apt- ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -#RUN chmod 777 /entrypoint.sh +# #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/cloudcommander/Dockerfile b/cloudcommander/Dockerfile index 74915c501..21535c3ec 100644 --- a/cloudcommander/Dockerfile +++ b/cloudcommander/Dockerfile @@ -65,15 +65,15 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi ENTRYPOINT [ "/ha_entrypoint.sh" ] -RUN chmod 777 /entrypoint.sh + ############ # 5 Labels # diff --git a/code-server/Dockerfile b/code-server/Dockerfile index 0665c1d09..0b886b5d0 100644 --- a/code-server/Dockerfile +++ b/code-server/Dockerfile @@ -88,14 +88,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -#RUN chmod 777 /entrypoint.sh +# #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 0452dcd0b..7c4317e8e 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -75,12 +75,12 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi ############ # 5 Labels # diff --git a/emby/Dockerfile b/emby/Dockerfile index 13c1e9d0a..d552e056b 100644 --- a/emby/Dockerfile +++ b/emby/Dockerfile @@ -87,12 +87,12 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi ############ # 5 Labels # diff --git a/enedisgateway2mqtt/Dockerfile b/enedisgateway2mqtt/Dockerfile index a64e9babb..d0488a17f 100644 --- a/enedisgateway2mqtt/Dockerfile +++ b/enedisgateway2mqtt/Dockerfile @@ -62,14 +62,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi + -RUN chmod 777 /entrypoint.sh ENTRYPOINT [ "/usr/bin/env" ] CMD ["/ha_entrypoint.sh"] VOLUME [ "/data" ] diff --git a/enedisgateway2mqtt_dev/Dockerfile b/enedisgateway2mqtt_dev/Dockerfile index 28eccee05..8d1c5536b 100644 --- a/enedisgateway2mqtt_dev/Dockerfile +++ b/enedisgateway2mqtt_dev/Dockerfile @@ -62,14 +62,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi + -RUN chmod 777 /entrypoint.sh ENTRYPOINT [ "/usr/bin/env" ] CMD ["/ha_entrypoint.sh"] VOLUME [ "/data" ] diff --git a/epicgamesfree/Dockerfile b/epicgamesfree/Dockerfile index e3c2cb9ee..816468010 100644 --- a/epicgamesfree/Dockerfile +++ b/epicgamesfree/Dockerfile @@ -27,7 +27,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ S6_SERVICES_GRACETIME=0 -RUN sed -i "1a /./entrypoint.sh" /usr/local/bin/docker-entrypoint.sh +RUN sed -i "1a /./ha_entrypoint.sh" /usr/local/bin/docker-entrypoint.sh ################## # 3 Install apps # @@ -64,14 +64,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -#RUN chmod 777 /entrypoint.sh +# #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/filebrowser/Dockerfile b/filebrowser/Dockerfile index 54a6c6292..126157d1b 100644 --- a/filebrowser/Dockerfile +++ b/filebrowser/Dockerfile @@ -64,16 +64,16 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi VOLUME [ "/data" ] WORKDIR / -RUN chmod 777 /entrypoint.sh + ENTRYPOINT [ "/usr/bin/env" ] CMD [ "/ha_entrypoint.sh" ] diff --git a/fireflyiii/Dockerfile b/fireflyiii/Dockerfile index 10790d2f5..6f2f00d32 100644 --- a/fireflyiii/Dockerfile +++ b/fireflyiii/Dockerfile @@ -73,14 +73,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi + -RUN chmod 777 /entrypoint.sh ENTRYPOINT [ "/usr/bin/env" ] CMD [ "/ha_entrypoint.sh" ] diff --git a/fireflyiii_data_importer/Dockerfile b/fireflyiii_data_importer/Dockerfile index 00a95f1fa..9ce35e94a 100644 --- a/fireflyiii_data_importer/Dockerfile +++ b/fireflyiii_data_importer/Dockerfile @@ -69,14 +69,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi + -RUN chmod 777 /entrypoint.sh ENTRYPOINT [ "/usr/bin/env" ] CMD [ "/ha_entrypoint.sh" ] diff --git a/fireflyiii_fints_importer/Dockerfile b/fireflyiii_fints_importer/Dockerfile index 3e60b69f9..157bcf0cd 100644 --- a/fireflyiii_fints_importer/Dockerfile +++ b/fireflyiii_fints_importer/Dockerfile @@ -63,14 +63,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi + -RUN chmod 777 /entrypoint.sh ENTRYPOINT [ "/usr/bin/env" ] CMD [ "/ha_entrypoint.sh" ] diff --git a/flaresolverr/Dockerfile b/flaresolverr/Dockerfile index eda9c2e1d..018a04743 100644 --- a/flaresolverr/Dockerfile +++ b/flaresolverr/Dockerfile @@ -63,14 +63,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi + -RUN chmod 777 /entrypoint.sh ENTRYPOINT [ "/usr/bin/env" ] CMD [ "/ha_entrypoint.sh" ] #WORKDIR / diff --git a/flexget/Dockerfile b/flexget/Dockerfile index e5869c53a..5c49751a9 100644 --- a/flexget/Dockerfile +++ b/flexget/Dockerfile @@ -99,14 +99,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -#RUN chmod 777 /entrypoint.sh +# #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/free_games_claimer/Dockerfile b/free_games_claimer/Dockerfile index baf41f61b..dd82e2a79 100644 --- a/free_games_claimer/Dockerfile +++ b/free_games_claimer/Dockerfile @@ -62,12 +62,12 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi RUN \ # Change data folder diff --git a/gazpar2mqtt/Dockerfile b/gazpar2mqtt/Dockerfile index 7bff52524..dda69fed8 100644 --- a/gazpar2mqtt/Dockerfile +++ b/gazpar2mqtt/Dockerfile @@ -64,14 +64,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi + -RUN chmod 777 /entrypoint.sh ENTRYPOINT [ "/usr/bin/env" ] CMD ["/ha_entrypoint.sh"] VOLUME [ "/data" ] diff --git a/gitea/Dockerfile b/gitea/Dockerfile index 67141a220..a24fd124b 100644 --- a/gitea/Dockerfile +++ b/gitea/Dockerfile @@ -66,14 +66,14 @@ EXPOSE 22 3000 ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi + -RUN chmod 777 /entrypoint.sh ENTRYPOINT [ "/ha_entrypoint.sh" ] ############ diff --git a/grav/Dockerfile b/grav/Dockerfile index fb2f7c6a0..111ed728e 100644 --- a/grav/Dockerfile +++ b/grav/Dockerfile @@ -91,12 +91,12 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi ############ # 5 Labels # diff --git a/guacamole/Dockerfile b/guacamole/Dockerfile index 86cfe4f28..0ff02c4f3 100644 --- a/guacamole/Dockerfile +++ b/guacamole/Dockerfile @@ -94,14 +94,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -#RUN chmod 777 /entrypoint.sh +# #WORKDIR /data #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/immich/Dockerfile b/immich/Dockerfile index db781915d..5579c133f 100644 --- a/immich/Dockerfile +++ b/immich/Dockerfile @@ -106,14 +106,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -#RUN chmod 777 /entrypoint.sh +# #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/inadyn/Dockerfile b/inadyn/Dockerfile index cae1972df..5514004c8 100644 --- a/inadyn/Dockerfile +++ b/inadyn/Dockerfile @@ -87,15 +87,15 @@ RUN apk add --no-cache \ ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi WORKDIR / -RUN chmod 777 /entrypoint.sh + ENTRYPOINT [ "/usr/bin/env" ] CMD [ "/ha_entrypoint.sh" ] VOLUME [ "/data" ] diff --git a/jackett/Dockerfile b/jackett/Dockerfile index c7e0bd6b2..868f0b726 100644 --- a/jackett/Dockerfile +++ b/jackett/Dockerfile @@ -90,12 +90,12 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi ############ # 5 Labels # diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile index 18221bd1e..65670b1da 100644 --- a/jellyfin/Dockerfile +++ b/jellyfin/Dockerfile @@ -95,14 +95,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -#RUN chmod 777 /entrypoint.sh +# #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/jellyseerr/Dockerfile b/jellyseerr/Dockerfile index 85e3e0178..7aa84ab4d 100644 --- a/jellyseerr/Dockerfile +++ b/jellyseerr/Dockerfile @@ -70,14 +70,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi + -RUN chmod 777 /entrypoint.sh ENTRYPOINT [ "/usr/bin/env" ] CMD [ "/ha_entrypoint.sh" ] WORKDIR /data diff --git a/joal/Dockerfile b/joal/Dockerfile index 025090499..67bf6a7f4 100644 --- a/joal/Dockerfile +++ b/joal/Dockerfile @@ -75,14 +75,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi + -RUN chmod 777 /entrypoint.sh ENTRYPOINT [ "/usr/bin/env" ] CMD [ "/ha_entrypoint.sh" ] diff --git a/joplin/Dockerfile b/joplin/Dockerfile index 689524d1d..7d35f62ec 100644 --- a/joplin/Dockerfile +++ b/joplin/Dockerfile @@ -69,14 +69,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi + -RUN chmod 777 /entrypoint.sh ENTRYPOINT [ "/usr/bin/env" ] CMD [ "/ha_entrypoint.sh" ] #WORKDIR / diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile index 499d491be..4b29cb165 100644 --- a/lidarr/Dockerfile +++ b/lidarr/Dockerfile @@ -90,14 +90,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -#RUN chmod 777 /entrypoint.sh +# #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/mealie/Dockerfile b/mealie/Dockerfile index 91f0ab8cd..04a109bbd 100644 --- a/mealie/Dockerfile +++ b/mealie/Dockerfile @@ -70,12 +70,12 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi RUN \ # Add custom instructions to run.sh on armv7 diff --git a/mylar3/Dockerfile b/mylar3/Dockerfile index 252b2b008..a1811eb9c 100644 --- a/mylar3/Dockerfile +++ b/mylar3/Dockerfile @@ -87,14 +87,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -#RUN chmod 777 /entrypoint.sh +# #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index 666380baf..26c339878 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -121,12 +121,12 @@ VOLUME ["/share", "/ssl", "/data", "/media"] ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi # Correct modifications ARG CONFIGLOCATION="/www/nextcloud/config" diff --git a/nzbget/Dockerfile b/nzbget/Dockerfile index 22a42600f..fc88ff992 100644 --- a/nzbget/Dockerfile +++ b/nzbget/Dockerfile @@ -87,14 +87,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -#RUN chmod 777 /entrypoint.sh +# #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/omada/Dockerfile b/omada/Dockerfile index 21a255ebc..5f901c8cf 100644 --- a/omada/Dockerfile +++ b/omada/Dockerfile @@ -70,14 +70,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -#RUN chmod 777 /entrypoint.sh +# #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/omada_v3/Dockerfile b/omada_v3/Dockerfile index a2534382b..c3cc2a79b 100644 --- a/omada_v3/Dockerfile +++ b/omada_v3/Dockerfile @@ -71,14 +71,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -#RUN chmod 777 /entrypoint.sh +# #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/ombi/Dockerfile b/ombi/Dockerfile index 4b51dd91f..79c73106a 100644 --- a/ombi/Dockerfile +++ b/ombi/Dockerfile @@ -87,14 +87,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -#RUN chmod 777 /entrypoint.sh +# #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/organizr/Dockerfile b/organizr/Dockerfile index 86595b083..6e537b8f7 100644 --- a/organizr/Dockerfile +++ b/organizr/Dockerfile @@ -87,12 +87,12 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi ############ # 5 Labels # diff --git a/overseerr/Dockerfile b/overseerr/Dockerfile index 69fe34328..ec70eea89 100644 --- a/overseerr/Dockerfile +++ b/overseerr/Dockerfile @@ -88,14 +88,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -#RUN chmod 777 /entrypoint.sh +# #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile index d49e0afb8..3fd59316c 100644 --- a/paperless_ngx/Dockerfile +++ b/paperless_ngx/Dockerfile @@ -30,7 +30,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Add custom scripts #RUN \ -# sed -i '/Paperless-ngx docker container starting/a /./entrypoint.sh' /sbin/docker-entrypoint.sh +# sed -i '/Paperless-ngx docker container starting/a /./ha_entrypoint.sh' /sbin/docker-entrypoint.sh ################## # 3 Install apps # @@ -67,14 +67,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi + -RUN chmod 777 /entrypoint.sh #WORKDIR / ENTRYPOINT [ "/usr/bin/env" ] CMD [ "/ha_entrypoint.sh" ] diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile index a19333c69..6df893d42 100644 --- a/papermerge/Dockerfile +++ b/papermerge/Dockerfile @@ -97,14 +97,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -#RUN chmod 777 /entrypoint.sh +# #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/photoprism/Dockerfile b/photoprism/Dockerfile index 32f190784..6e9945b0a 100644 --- a/photoprism/Dockerfile +++ b/photoprism/Dockerfile @@ -74,14 +74,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi + -RUN chmod 777 /entrypoint.sh ENTRYPOINT [ "/usr/bin/env" ] CMD [ "/ha_entrypoint.sh" ] WORKDIR "/data/photoprism" diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile index 77aa8d752..cd4893d58 100644 --- a/piwigo/Dockerfile +++ b/piwigo/Dockerfile @@ -89,19 +89,19 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi # hadolint ignore=SC2013 RUN \ for file in $(grep -Esril "/local/config/addons_config/piwigo" /etc /defaults); do sed -i "s=/local/config/addons_config/piwigo=/local/config=g" "$file"; done -#RUN chmod 777 /entrypoint.sh +# #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/plex/Dockerfile b/plex/Dockerfile index c48536c74..2e4de854a 100644 --- a/plex/Dockerfile +++ b/plex/Dockerfile @@ -99,14 +99,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -#RUN chmod 777 /entrypoint.sh +# #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/plex_meta_manager/Dockerfile b/plex_meta_manager/Dockerfile index 8dc827876..4ceec83d8 100644 --- a/plex_meta_manager/Dockerfile +++ b/plex_meta_manager/Dockerfile @@ -95,14 +95,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -#RUN chmod 777 /entrypoint.sh +# #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/portainer/Dockerfile b/portainer/Dockerfile index 6450131ac..28717ecbf 100644 --- a/portainer/Dockerfile +++ b/portainer/Dockerfile @@ -85,15 +85,15 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi RUN chmod 777 /etc/services.d/*/* -#RUN chmod 777 /entrypoint.sh +# #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/portainer_agent/Dockerfile b/portainer_agent/Dockerfile index 4548d4d53..57ad56257 100644 --- a/portainer_agent/Dockerfile +++ b/portainer_agent/Dockerfile @@ -71,12 +71,12 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi RUN chmod a+x /usr/sbin/healthcheck && \ chmod a+x /usr/sbin/wait-for-signal diff --git a/postgres/Dockerfile b/postgres/Dockerfile index e41c28d95..8e55ac83a 100644 --- a/postgres/Dockerfile +++ b/postgres/Dockerfile @@ -67,14 +67,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi + -RUN chmod 777 /entrypoint.sh WORKDIR /data ENTRYPOINT [ "/usr/bin/env" ] CMD [ "/ha_entrypoint.sh" ] diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile index f0b163d32..99c5e4ce9 100644 --- a/prowlarr/Dockerfile +++ b/prowlarr/Dockerfile @@ -90,14 +90,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -#RUN chmod 777 /entrypoint.sh +# #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile index eca70fc6e..91008775c 100644 --- a/qbittorrent/Dockerfile +++ b/qbittorrent/Dockerfile @@ -125,12 +125,12 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi ############ # 5 Labels # diff --git a/radarr/Dockerfile b/radarr/Dockerfile index 8288a0bf4..6d8cb26da 100644 --- a/radarr/Dockerfile +++ b/radarr/Dockerfile @@ -91,14 +91,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -#RUN chmod 777 /entrypoint.sh +# #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/readarr/Dockerfile b/readarr/Dockerfile index 8312b0694..699e97caf 100644 --- a/readarr/Dockerfile +++ b/readarr/Dockerfile @@ -88,14 +88,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -#RUN chmod 777 /entrypoint.sh +# #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile index c44d8d377..d4c5c8ee5 100644 --- a/requestrr/Dockerfile +++ b/requestrr/Dockerfile @@ -90,14 +90,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -#RUN chmod 777 /entrypoint.sh +# #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile index 9a9877ef7..8002f2f7a 100644 --- a/resiliosync/Dockerfile +++ b/resiliosync/Dockerfile @@ -110,14 +110,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -#RUN chmod 777 /entrypoint.sh +# #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/sabnzbd/Dockerfile b/sabnzbd/Dockerfile index 6493b42cc..d33a6bf8c 100644 --- a/sabnzbd/Dockerfile +++ b/sabnzbd/Dockerfile @@ -87,14 +87,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -#RUN chmod 777 /entrypoint.sh +# #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/scrutiny/Dockerfile b/scrutiny/Dockerfile index b34ab2b98..d70965e56 100644 --- a/scrutiny/Dockerfile +++ b/scrutiny/Dockerfile @@ -65,12 +65,12 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi diff --git a/scrutiny_fa/Dockerfile b/scrutiny_fa/Dockerfile index b34ab2b98..d70965e56 100644 --- a/scrutiny_fa/Dockerfile +++ b/scrutiny_fa/Dockerfile @@ -65,12 +65,12 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi diff --git a/seafile/Dockerfile b/seafile/Dockerfile index 92f788328..4a04df360 100644 --- a/seafile/Dockerfile +++ b/seafile/Dockerfile @@ -67,14 +67,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi + -RUN chmod 777 /entrypoint.sh ENTRYPOINT [ "/usr/bin/env" ] CMD [ "/ha_entrypoint.sh" ] diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile index 7a9c65957..134b7a305 100644 --- a/sonarr/Dockerfile +++ b/sonarr/Dockerfile @@ -91,14 +91,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -#RUN chmod 777 /entrypoint.sh +# #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/sponsorblockcast/Dockerfile b/sponsorblockcast/Dockerfile index 814f758fa..ee3243202 100644 --- a/sponsorblockcast/Dockerfile +++ b/sponsorblockcast/Dockerfile @@ -59,15 +59,15 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi # Entrypoint logic -RUN chmod 777 /entrypoint.sh + #WORKDIR / ENTRYPOINT [ "/usr/bin/env" ] CMD [ "/ha_entrypoint.sh" ] diff --git a/spotweb/Dockerfile b/spotweb/Dockerfile index 9c69ecdf8..2f764e51d 100644 --- a/spotweb/Dockerfile +++ b/spotweb/Dockerfile @@ -120,12 +120,12 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi ############ # 5 Labels # diff --git a/tandoor_recipes/Dockerfile b/tandoor_recipes/Dockerfile index d54ecd313..d39f67dcc 100644 --- a/tandoor_recipes/Dockerfile +++ b/tandoor_recipes/Dockerfile @@ -61,14 +61,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi + -RUN chmod 777 /entrypoint.sh #WORKDIR /data/recipes ENTRYPOINT [ "/usr/bin/env" ] CMD [ "/ha_entrypoint.sh" ] diff --git a/tdarr/Dockerfile b/tdarr/Dockerfile index 8fcbc441a..83b73ca9e 100644 --- a/tdarr/Dockerfile +++ b/tdarr/Dockerfile @@ -62,12 +62,12 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi ############ # 5 Labels # diff --git a/teamspeak/Dockerfile b/teamspeak/Dockerfile index 56048be53..96d4d50d6 100644 --- a/teamspeak/Dockerfile +++ b/teamspeak/Dockerfile @@ -68,14 +68,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -#RUN chmod 777 /entrypoint.sh +# #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/transmission/Dockerfile b/transmission/Dockerfile index 2794b6bfc..a59770048 100644 --- a/transmission/Dockerfile +++ b/transmission/Dockerfile @@ -97,14 +97,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -#RUN chmod 777 /entrypoint.sh +# #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/transmission_openvpn/Dockerfile b/transmission_openvpn/Dockerfile index e7cdaf4e3..e1367e892 100644 --- a/transmission_openvpn/Dockerfile +++ b/transmission_openvpn/Dockerfile @@ -92,14 +92,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi + -RUN chmod 777 /entrypoint.sh CMD [ "/ha_entrypoint.sh" ] SHELL ["/bin/bash", "-o", "pipefail", "-c"] diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile index 4ef97498f..0f304aa61 100644 --- a/ubooquity/Dockerfile +++ b/ubooquity/Dockerfile @@ -100,14 +100,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -#RUN chmod 777 /entrypoint.sh +# #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/unpackerr/Dockerfile b/unpackerr/Dockerfile index f9377d2df..d33cdc40b 100644 --- a/unpackerr/Dockerfile +++ b/unpackerr/Dockerfile @@ -86,12 +86,12 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi ############ # 5 Labels # diff --git a/webtop_kde/Dockerfile b/webtop_kde/Dockerfile index e11d64779..912cbccf8 100644 --- a/webtop_kde/Dockerfile +++ b/webtop_kde/Dockerfile @@ -97,14 +97,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -#RUN chmod 777 /entrypoint.sh +# #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/webtrees/Dockerfile b/webtrees/Dockerfile index ff13ad98f..f486bc893 100644 --- a/webtrees/Dockerfile +++ b/webtrees/Dockerfile @@ -75,14 +75,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi + -RUN chmod 777 /entrypoint.sh ENTRYPOINT [ "/usr/bin/env" ] CMD [ "/ha_entrypoint.sh" ] diff --git a/wger/Dockerfile b/wger/Dockerfile index 8c5d011b5..b369da130 100644 --- a/wger/Dockerfile +++ b/wger/Dockerfile @@ -36,7 +36,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ USER root RUN echo "wger ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers && \ - sed -i "1a sudo -E '/./entrypoint.sh' || true" /home/wger/entrypoint.sh + sed -i "1a sudo -E '/./ha_entrypoint.sh' || true" /home/wger/entrypoint.sh ################## # 3 Install apps # @@ -72,14 +72,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi + -RUN chmod 777 /entrypoint.sh USER wger #CMD [ "/ha_entrypoint.sh" ] diff --git a/whoogle/Dockerfile b/whoogle/Dockerfile index d494af66f..af58f98b8 100644 --- a/whoogle/Dockerfile +++ b/whoogle/Dockerfile @@ -67,14 +67,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi + -RUN chmod 777 /entrypoint.sh ENTRYPOINT [ "/usr/bin/env" ] CMD [ "/ha_entrypoint.sh" ] diff --git a/xteve/Dockerfile b/xteve/Dockerfile index cff890c1b..5afa5d413 100644 --- a/xteve/Dockerfile +++ b/xteve/Dockerfile @@ -67,14 +67,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi -#RUN chmod 777 /entrypoint.sh +# #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/ha_entrypoint.sh" ] diff --git a/zoneminder/Dockerfile b/zoneminder/Dockerfile index 726fa2455..92d50671b 100644 --- a/zoneminder/Dockerfile +++ b/zoneminder/Dockerfile @@ -72,14 +72,14 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get ################ # Add entrypoint -ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/entrypoint.sh" "/ha_entrypoint.sh" +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh" # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /docker-mods ] && [ -f /entrypoint.sh ]; then sed -i "1a /./entrypoint.sh" /docker-mods; fi + if [ -f /docker-mods ] && [ -f /ha_entrypoint.sh ]; then sed -i "1a /./ha_entrypoint.sh" /docker-mods; fi + -RUN chmod 777 /entrypoint.sh ENTRYPOINT [ "/usr/bin/env" ] CMD [ "/ha_entrypoint.sh" ]