From 2c2502f575d360da88c27f3ade92d46444f88e58 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Sat, 9 Sep 2023 19:24:52 +0200 Subject: [PATCH] ha_autoapps script --- .templates/ha_autoapps.sh | 26 ++++++++++++++++++++++++++ addons_updater/Dockerfile | 9 ++------- arpspoof/Dockerfile | 9 ++------- autobrr/Dockerfile | 9 ++------- baikal/Dockerfile | 9 ++------- bazarr/Dockerfile | 9 ++------- binance-trading-bot/Dockerfile | 9 ++------- bitwarden/Dockerfile | 9 ++------- booksonic_air/Dockerfile | 9 ++------- browserless_chrome/Dockerfile | 9 ++------- calibre/Dockerfile | 9 ++------- calibre_web/Dockerfile | 9 ++------- cloudcommander/Dockerfile | 9 ++------- code-server/Dockerfile | 9 ++------- elasticsearch/Dockerfile | 9 ++------- emby/Dockerfile | 9 ++------- enedisgateway2mqtt/Dockerfile | 9 ++------- enedisgateway2mqtt_dev/Dockerfile | 9 ++------- epicgamesfree/Dockerfile | 9 ++------- filebrowser/Dockerfile | 9 ++------- fireflyiii/Dockerfile | 9 ++------- fireflyiii_data_importer/Dockerfile | 9 ++------- fireflyiii_fints_importer/Dockerfile | 9 ++------- flaresolverr/Dockerfile | 9 ++------- flexget/Dockerfile | 9 ++------- free_games_claimer/Dockerfile | 9 ++------- gazpar2mqtt/Dockerfile | 9 ++------- gitea/Dockerfile | 9 ++------- grav/Dockerfile | 9 ++------- guacamole/Dockerfile | 9 ++------- immich/Dockerfile | 9 ++------- inadyn/Dockerfile | 9 ++------- jackett/Dockerfile | 9 ++------- jellyfin/Dockerfile | 9 ++------- jellyseerr/Dockerfile | 9 ++------- joal/Dockerfile | 9 ++------- joplin/Dockerfile | 9 ++------- lidarr/Dockerfile | 9 ++------- mealie/Dockerfile | 9 ++------- mylar3/Dockerfile | 9 ++------- nextcloud/Dockerfile | 9 ++------- nzbget/Dockerfile | 9 ++------- omada/Dockerfile | 9 ++------- omada_v3/Dockerfile | 9 ++------- ombi/Dockerfile | 9 ++------- organizr/Dockerfile | 9 ++------- overseerr/Dockerfile | 9 ++------- paperless_ngx/Dockerfile | 9 ++------- papermerge/Dockerfile | 9 ++------- photoprism/Dockerfile | 9 ++------- piwigo/Dockerfile | 9 ++------- plex/Dockerfile | 9 ++------- plex_meta_manager/Dockerfile | 9 ++------- portainer/Dockerfile | 9 ++------- portainer_agent/Dockerfile | 9 ++------- postgres/Dockerfile | 9 ++------- prowlarr/Dockerfile | 9 ++------- qbittorrent/Dockerfile | 9 ++------- radarr/Dockerfile | 9 ++------- readarr/Dockerfile | 9 ++------- requestrr/Dockerfile | 9 ++------- resiliosync/Dockerfile | 9 ++------- sabnzbd/Dockerfile | 9 ++------- scrutiny/Dockerfile | 9 ++------- scrutiny_fa/Dockerfile | 9 ++------- seafile/Dockerfile | 9 ++------- sonarr/Dockerfile | 9 ++------- sponsorblockcast/Dockerfile | 9 ++------- spotweb/Dockerfile | 9 ++------- tandoor_recipes/Dockerfile | 10 +++------- tdarr/Dockerfile | 9 ++------- teamspeak/Dockerfile | 9 ++------- transmission/Dockerfile | 9 ++------- transmission_openvpn/Dockerfile | 9 ++------- ubooquity/Dockerfile | 9 ++------- unpackerr/Dockerfile | 9 ++------- webtop_kde/Dockerfile | 9 ++------- webtrees/Dockerfile | 9 ++------- wger/Dockerfile | 8 ++------ whoogle/Dockerfile | 9 ++------- xteve/Dockerfile | 9 ++------- zoneminder/Dockerfile | 9 ++------- 82 files changed, 189 insertions(+), 566 deletions(-) create mode 100644 .templates/ha_autoapps.sh diff --git a/.templates/ha_autoapps.sh b/.templates/ha_autoapps.sh new file mode 100644 index 000000000..3b2c6051e --- /dev/null +++ b/.templates/ha_autoapps.sh @@ -0,0 +1,26 @@ +#!/bin/sh +# shellcheck disable=SC2015 + +############################## +# Automatic apps download # +############################## + +PACKAGES="$1" + +# Install bash if needed +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 + +# Install curl if needed +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 + +# Call apps installer script if needed +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:-}" + +# Clean +rm /automatic_packages.sh diff --git a/addons_updater/Dockerfile b/addons_updater/Dockerfile index e886a5ef5..c868c8531 100644 --- a/addons_updater/Dockerfile +++ b/addons_updater/Dockerfile @@ -47,13 +47,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/arpspoof/Dockerfile b/arpspoof/Dockerfile index f394bb67b..9fa904877 100644 --- a/arpspoof/Dockerfile +++ b/arpspoof/Dockerfile @@ -47,13 +47,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="jq curl iproute2" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/autobrr/Dockerfile b/autobrr/Dockerfile index 031a4bec3..91cac8d33 100644 --- a/autobrr/Dockerfile +++ b/autobrr/Dockerfile @@ -54,13 +54,8 @@ ENV PACKAGES="jq \ keyutils nginx" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/baikal/Dockerfile b/baikal/Dockerfile index 5f3449e2a..ffecb443d 100644 --- a/baikal/Dockerfile +++ b/baikal/Dockerfile @@ -50,13 +50,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ARG PACKAGES="" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile index d680f0b8c..4a58c0f8e 100644 --- a/bazarr/Dockerfile +++ b/bazarr/Dockerfile @@ -51,13 +51,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/binance-trading-bot/Dockerfile b/binance-trading-bot/Dockerfile index 6f91c2878..c49741a7f 100644 --- a/binance-trading-bot/Dockerfile +++ b/binance-trading-bot/Dockerfile @@ -67,13 +67,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="sudo redis nginx" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/bitwarden/Dockerfile b/bitwarden/Dockerfile index 90bb8ae3f..3fc3fc5e9 100644 --- a/bitwarden/Dockerfile +++ b/bitwarden/Dockerfile @@ -57,13 +57,8 @@ ENV PACKAGES="libmariadb-dev-compat \ sqlite3" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile index 1e16879cd..c88d9cfce 100644 --- a/booksonic_air/Dockerfile +++ b/booksonic_air/Dockerfile @@ -57,13 +57,8 @@ ENV PACKAGES="jq \ keyutils" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/browserless_chrome/Dockerfile b/browserless_chrome/Dockerfile index 2b20dffc8..192ee383d 100644 --- a/browserless_chrome/Dockerfile +++ b/browserless_chrome/Dockerfile @@ -48,13 +48,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/calibre/Dockerfile b/calibre/Dockerfile index 1e58c7881..a181a8c74 100644 --- a/calibre/Dockerfile +++ b/calibre/Dockerfile @@ -60,13 +60,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/calibre_web/Dockerfile b/calibre_web/Dockerfile index b5f1fdb14..4a982c8c8 100644 --- a/calibre_web/Dockerfile +++ b/calibre_web/Dockerfile @@ -62,13 +62,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="libnss3 libxtst6 libxrandr2" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh # Install sqlite3 & set defaults RUN if ! command -v sqlite3 >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends sqlite3 || apk add --no-cache sqlite3) >/dev/null; fi \ diff --git a/cloudcommander/Dockerfile b/cloudcommander/Dockerfile index e3b6e55ae..16833cf02 100644 --- a/cloudcommander/Dockerfile +++ b/cloudcommander/Dockerfile @@ -48,13 +48,8 @@ ENV PACKAGES="jq \ nginx" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/code-server/Dockerfile b/code-server/Dockerfile index 028adf059..f5f9cb772 100644 --- a/code-server/Dockerfile +++ b/code-server/Dockerfile @@ -51,13 +51,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="jq" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 9291e7aa3..43aa83b11 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -59,13 +59,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/emby/Dockerfile b/emby/Dockerfile index 55812e9da..685886f79 100644 --- a/emby/Dockerfile +++ b/emby/Dockerfile @@ -50,13 +50,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="nginx" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/enedisgateway2mqtt/Dockerfile b/enedisgateway2mqtt/Dockerfile index 980d7d837..9cd387e5d 100644 --- a/enedisgateway2mqtt/Dockerfile +++ b/enedisgateway2mqtt/Dockerfile @@ -46,13 +46,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="nginx yamllint" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/enedisgateway2mqtt_dev/Dockerfile b/enedisgateway2mqtt_dev/Dockerfile index e271c70b0..5102cf009 100644 --- a/enedisgateway2mqtt_dev/Dockerfile +++ b/enedisgateway2mqtt_dev/Dockerfile @@ -46,13 +46,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="nginx yamllint" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/epicgamesfree/Dockerfile b/epicgamesfree/Dockerfile index 139825633..5a03dc27a 100644 --- a/epicgamesfree/Dockerfile +++ b/epicgamesfree/Dockerfile @@ -48,13 +48,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/filebrowser/Dockerfile b/filebrowser/Dockerfile index 29abc94e6..2918d2e5b 100644 --- a/filebrowser/Dockerfile +++ b/filebrowser/Dockerfile @@ -48,13 +48,8 @@ ENV PACKAGES="bind-tools \ nginx" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/fireflyiii/Dockerfile b/fireflyiii/Dockerfile index 625b1bc6b..264274639 100644 --- a/fireflyiii/Dockerfile +++ b/fireflyiii/Dockerfile @@ -57,13 +57,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="cron mariadb-client" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/fireflyiii_data_importer/Dockerfile b/fireflyiii_data_importer/Dockerfile index 5e458136d..2d1cd7f2a 100644 --- a/fireflyiii_data_importer/Dockerfile +++ b/fireflyiii_data_importer/Dockerfile @@ -53,13 +53,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="cron" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/fireflyiii_fints_importer/Dockerfile b/fireflyiii_fints_importer/Dockerfile index 778508a1a..9ac07d2ad 100644 --- a/fireflyiii_fints_importer/Dockerfile +++ b/fireflyiii_fints_importer/Dockerfile @@ -47,13 +47,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="apk-cron" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/flaresolverr/Dockerfile b/flaresolverr/Dockerfile index 8557bf1e7..febf8ab88 100644 --- a/flaresolverr/Dockerfile +++ b/flaresolverr/Dockerfile @@ -47,13 +47,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/flexget/Dockerfile b/flexget/Dockerfile index baddec6d3..23bb128f4 100644 --- a/flexget/Dockerfile +++ b/flexget/Dockerfile @@ -63,13 +63,8 @@ ENV PACKAGES="jq \ cifs-utils" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/free_games_claimer/Dockerfile b/free_games_claimer/Dockerfile index bf48614e7..4ff5081b8 100644 --- a/free_games_claimer/Dockerfile +++ b/free_games_claimer/Dockerfile @@ -46,13 +46,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/gazpar2mqtt/Dockerfile b/gazpar2mqtt/Dockerfile index 5360b23bd..a74ccc1a5 100644 --- a/gazpar2mqtt/Dockerfile +++ b/gazpar2mqtt/Dockerfile @@ -48,13 +48,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/gitea/Dockerfile b/gitea/Dockerfile index 096a768ab..a9e6d33f1 100644 --- a/gitea/Dockerfile +++ b/gitea/Dockerfile @@ -48,13 +48,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh EXPOSE 22 3000 diff --git a/grav/Dockerfile b/grav/Dockerfile index 12cd60e24..defe098eb 100644 --- a/grav/Dockerfile +++ b/grav/Dockerfile @@ -54,13 +54,8 @@ ENV PACKAGES="jq \ keyutils" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/guacamole/Dockerfile b/guacamole/Dockerfile index 68e2a138c..fdfa23825 100644 --- a/guacamole/Dockerfile +++ b/guacamole/Dockerfile @@ -78,13 +78,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="nginx" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/immich/Dockerfile b/immich/Dockerfile index c696742b1..d07a93423 100644 --- a/immich/Dockerfile +++ b/immich/Dockerfile @@ -69,13 +69,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="sudo redis-server yamllint pip libxml2-dev libxslt-dev libjpeg-dev zlib1g-dev build-essential" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/inadyn/Dockerfile b/inadyn/Dockerfile index c0ead1efd..2537c4dc3 100644 --- a/inadyn/Dockerfile +++ b/inadyn/Dockerfile @@ -52,13 +52,8 @@ ENV PACKAGES="curl \ build-base libressl-dev ca-certificates npm" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh # Install mustache # spellcheck disable=SC2015 diff --git a/jackett/Dockerfile b/jackett/Dockerfile index 826f6c84f..644b262ff 100644 --- a/jackett/Dockerfile +++ b/jackett/Dockerfile @@ -53,13 +53,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="curl" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile index a5d7ccee9..3eda7a5fc 100644 --- a/jellyfin/Dockerfile +++ b/jellyfin/Dockerfile @@ -58,13 +58,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="nginx" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/jellyseerr/Dockerfile b/jellyseerr/Dockerfile index 506f1e261..c2736de5a 100644 --- a/jellyseerr/Dockerfile +++ b/jellyseerr/Dockerfile @@ -56,13 +56,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/joal/Dockerfile b/joal/Dockerfile index 191ad0c56..f2d2ddf51 100644 --- a/joal/Dockerfile +++ b/joal/Dockerfile @@ -52,13 +52,8 @@ ENV PACKAGES="jq \ nginx" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh # Modules ARG MODULES="00-banner.sh 01-custom_script.sh" diff --git a/joplin/Dockerfile b/joplin/Dockerfile index 5e0e74a45..1e7b53135 100644 --- a/joplin/Dockerfile +++ b/joplin/Dockerfile @@ -53,13 +53,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="procps" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile index 2202ad560..5f5bedc6a 100644 --- a/lidarr/Dockerfile +++ b/lidarr/Dockerfile @@ -53,13 +53,8 @@ ENV PACKAGES="jq \ keyutils" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/mealie/Dockerfile b/mealie/Dockerfile index ac4610e3a..7495a5e1b 100644 --- a/mealie/Dockerfile +++ b/mealie/Dockerfile @@ -54,13 +54,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="nginx" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/mylar3/Dockerfile b/mylar3/Dockerfile index 29a7655dc..6a7f2bc77 100644 --- a/mylar3/Dockerfile +++ b/mylar3/Dockerfile @@ -50,13 +50,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index 42f990f25..c858af5c8 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -74,13 +74,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="gcompat" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh VOLUME ["/share", "/ssl", "/data", "/media"] diff --git a/nzbget/Dockerfile b/nzbget/Dockerfile index 8098ca027..4f616f781 100644 --- a/nzbget/Dockerfile +++ b/nzbget/Dockerfile @@ -50,13 +50,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="nginx" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/omada/Dockerfile b/omada/Dockerfile index 5ef125da6..d8ec2bb04 100644 --- a/omada/Dockerfile +++ b/omada/Dockerfile @@ -54,13 +54,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/omada_v3/Dockerfile b/omada_v3/Dockerfile index f8116ec92..bdf33d44d 100644 --- a/omada_v3/Dockerfile +++ b/omada_v3/Dockerfile @@ -55,13 +55,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/ombi/Dockerfile b/ombi/Dockerfile index e594542a3..8e44e6cab 100644 --- a/ombi/Dockerfile +++ b/ombi/Dockerfile @@ -50,13 +50,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="jq curl" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/organizr/Dockerfile b/organizr/Dockerfile index 1fcb2431c..c241b6b63 100644 --- a/organizr/Dockerfile +++ b/organizr/Dockerfile @@ -50,13 +50,8 @@ ENV PACKAGES="curl \ jq" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/overseerr/Dockerfile b/overseerr/Dockerfile index 5b2816bd0..5d215cdc1 100644 --- a/overseerr/Dockerfile +++ b/overseerr/Dockerfile @@ -51,13 +51,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile index 5d9df98ef..25e3f6402 100644 --- a/paperless_ngx/Dockerfile +++ b/paperless_ngx/Dockerfile @@ -51,13 +51,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="redis-server yamllint pip libxml2-dev libxslt-dev python-dev libjpeg-dev zlib1g-dev python3-dev build-essential nginx" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile index f6a19128c..f8294094b 100644 --- a/papermerge/Dockerfile +++ b/papermerge/Dockerfile @@ -61,13 +61,8 @@ ENV PACKAGES="jq \ keyutils" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/photoprism/Dockerfile b/photoprism/Dockerfile index 7b2e864ac..f22982c16 100644 --- a/photoprism/Dockerfile +++ b/photoprism/Dockerfile @@ -58,13 +58,8 @@ ENV PACKAGES="jq \ nginx" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile index 031612445..5ecbc464f 100644 --- a/piwigo/Dockerfile +++ b/piwigo/Dockerfile @@ -52,13 +52,8 @@ ENV PACKAGES="jq \ cifs-utils" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/plex/Dockerfile b/plex/Dockerfile index bff7b63b1..c4a7536aa 100644 --- a/plex/Dockerfile +++ b/plex/Dockerfile @@ -63,13 +63,8 @@ ENV PACKAGES="jq \ keyutils" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/plex_meta_manager/Dockerfile b/plex_meta_manager/Dockerfile index 00f5dd60d..9b59d7f08 100644 --- a/plex_meta_manager/Dockerfile +++ b/plex_meta_manager/Dockerfile @@ -59,13 +59,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/portainer/Dockerfile b/portainer/Dockerfile index c155e5317..91f9e66b6 100644 --- a/portainer/Dockerfile +++ b/portainer/Dockerfile @@ -69,13 +69,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="nginx" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/portainer_agent/Dockerfile b/portainer_agent/Dockerfile index fdd9d3ab4..99de5f895 100644 --- a/portainer_agent/Dockerfile +++ b/portainer_agent/Dockerfile @@ -55,13 +55,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="nginx" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/postgres/Dockerfile b/postgres/Dockerfile index a697e907f..63d3dcb46 100644 --- a/postgres/Dockerfile +++ b/postgres/Dockerfile @@ -51,13 +51,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile index 8644a132b..45bd5f7f4 100644 --- a/prowlarr/Dockerfile +++ b/prowlarr/Dockerfile @@ -53,13 +53,8 @@ ENV PACKAGES="jq \ keyutils" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile index 528b58581..6f208ec66 100644 --- a/qbittorrent/Dockerfile +++ b/qbittorrent/Dockerfile @@ -85,13 +85,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ARG PACKAGES="" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh # Switch scripts from s6 v2 to v3 #RUN if [ -f /etc/s6-overlay/s6-rc.d/init-custom-file/run ]; then mkdir "/custom-cont-init.d" && for SCRIPTS in /etc/cont-init.d/*; do [ -e "$SCRIPTS" ] || continue \ diff --git a/radarr/Dockerfile b/radarr/Dockerfile index 067f4801b..1c33f91f1 100644 --- a/radarr/Dockerfile +++ b/radarr/Dockerfile @@ -54,13 +54,8 @@ ENV PACKAGES="jq \ keyutils" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/readarr/Dockerfile b/readarr/Dockerfile index 7cade339d..2eea7dff3 100644 --- a/readarr/Dockerfile +++ b/readarr/Dockerfile @@ -51,13 +51,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile index db472629e..5565c648a 100644 --- a/requestrr/Dockerfile +++ b/requestrr/Dockerfile @@ -53,13 +53,8 @@ ENV PACKAGES="jq \ keyutils" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile index e755cd962..301dcb8bc 100644 --- a/resiliosync/Dockerfile +++ b/resiliosync/Dockerfile @@ -74,13 +74,8 @@ ENV PACKAGES="jq \ nginx" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/sabnzbd/Dockerfile b/sabnzbd/Dockerfile index 88949e0d9..00dbd9337 100644 --- a/sabnzbd/Dockerfile +++ b/sabnzbd/Dockerfile @@ -50,13 +50,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="nginx" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/scrutiny/Dockerfile b/scrutiny/Dockerfile index 4506f123e..b91f8ccdb 100644 --- a/scrutiny/Dockerfile +++ b/scrutiny/Dockerfile @@ -49,13 +49,8 @@ ENV PACKAGES="jq \ nginx" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/scrutiny_fa/Dockerfile b/scrutiny_fa/Dockerfile index 4506f123e..b91f8ccdb 100644 --- a/scrutiny_fa/Dockerfile +++ b/scrutiny_fa/Dockerfile @@ -49,13 +49,8 @@ ENV PACKAGES="jq \ nginx" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/seafile/Dockerfile b/seafile/Dockerfile index 9ac9441f6..bf8ee29bb 100644 --- a/seafile/Dockerfile +++ b/seafile/Dockerfile @@ -51,13 +51,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile index 8f973f54f..4d78e7de7 100644 --- a/sonarr/Dockerfile +++ b/sonarr/Dockerfile @@ -54,13 +54,8 @@ ENV PACKAGES="jq \ keyutils nginx" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/sponsorblockcast/Dockerfile b/sponsorblockcast/Dockerfile index 55f276378..e557010cf 100644 --- a/sponsorblockcast/Dockerfile +++ b/sponsorblockcast/Dockerfile @@ -48,13 +48,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/spotweb/Dockerfile b/spotweb/Dockerfile index 561e06944..eddad027a 100644 --- a/spotweb/Dockerfile +++ b/spotweb/Dockerfile @@ -104,13 +104,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/tandoor_recipes/Dockerfile b/tandoor_recipes/Dockerfile index c15460a31..57e14f05d 100644 --- a/tandoor_recipes/Dockerfile +++ b/tandoor_recipes/Dockerfile @@ -46,13 +46,9 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="nginx mysql-client" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh + ################ # 4 Entrypoint # ################ diff --git a/tdarr/Dockerfile b/tdarr/Dockerfile index 06056fe9c..9e3d895e3 100644 --- a/tdarr/Dockerfile +++ b/tdarr/Dockerfile @@ -46,13 +46,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="libgles2-mesa libgles2-mesa-dev xorg-dev" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/teamspeak/Dockerfile b/teamspeak/Dockerfile index 7b41bef49..635dee607 100644 --- a/teamspeak/Dockerfile +++ b/teamspeak/Dockerfile @@ -52,13 +52,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/transmission/Dockerfile b/transmission/Dockerfile index cb0ff4125..76af13be0 100644 --- a/transmission/Dockerfile +++ b/transmission/Dockerfile @@ -61,13 +61,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="nginx" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/transmission_openvpn/Dockerfile b/transmission_openvpn/Dockerfile index 88e7508b8..90fb29f85 100644 --- a/transmission_openvpn/Dockerfile +++ b/transmission_openvpn/Dockerfile @@ -56,13 +56,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="nginx" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile index 1815f58cb..7e5fa57cb 100644 --- a/ubooquity/Dockerfile +++ b/ubooquity/Dockerfile @@ -64,13 +64,8 @@ ENV PACKAGES="curl \ nginx" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/unpackerr/Dockerfile b/unpackerr/Dockerfile index 130beaaf9..9b52d64f3 100644 --- a/unpackerr/Dockerfile +++ b/unpackerr/Dockerfile @@ -49,13 +49,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ARG PACKAGES="" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/webtop_kde/Dockerfile b/webtop_kde/Dockerfile index c6116bd76..f441ab7ad 100644 --- a/webtop_kde/Dockerfile +++ b/webtop_kde/Dockerfile @@ -60,13 +60,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="nginx engrampa" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/webtrees/Dockerfile b/webtrees/Dockerfile index cd756a063..24117ed7f 100644 --- a/webtrees/Dockerfile +++ b/webtrees/Dockerfile @@ -59,13 +59,8 @@ ENV PACKAGES="jq \ yamllint" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/wger/Dockerfile b/wger/Dockerfile index 284b5979a..174af19fe 100644 --- a/wger/Dockerfile +++ b/wger/Dockerfile @@ -57,12 +57,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="sudo nginx" # Automatic apps & bashio -RUN 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 || printf '%s\n' "${PACKAGES:-}" > /ENVFILE +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/whoogle/Dockerfile b/whoogle/Dockerfile index f33d363eb..21891f377 100644 --- a/whoogle/Dockerfile +++ b/whoogle/Dockerfile @@ -51,13 +51,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/xteve/Dockerfile b/xteve/Dockerfile index feca2cf95..56f1e56ca 100644 --- a/xteve/Dockerfile +++ b/xteve/Dockerfile @@ -51,13 +51,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint # diff --git a/zoneminder/Dockerfile b/zoneminder/Dockerfile index 42ff77e2d..6a5e9a24d 100644 --- a/zoneminder/Dockerfile +++ b/zoneminder/Dockerfile @@ -56,13 +56,8 @@ RUN /ha_modules.sh "$MODULES" && rm /ha_modules.sh ENV PACKAGES="" # Automatic apps & bashio -# hadolint ignore=SC2015 -RUN 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 +ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_modules.sh" "/ha_autoapps.sh" +RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh ################ # 4 Entrypoint #