From 68621505cef5804e094d8a4c55fbb8040defe78f Mon Sep 17 00:00:00 2001 From: Alexandre Date: Sat, 26 Nov 2022 20:16:15 +0100 Subject: [PATCH] Activate github builds --- addons_updater/Dockerfile | 5 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- arpspoof/Dockerfile | 5 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- baikal/Dockerfile | 5 +- bazarr/Dockerfile | 5 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- bitwarden/Dockerfile | 5 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- booksonic_air/Dockerfile | 5 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- calibre/Dockerfile | 5 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- calibre_web/Dockerfile | 5 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- cloudcommander/Dockerfile | 5 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- code-server/Dockerfile | 5 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- elasticsearch/Dockerfile | 5 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- emby/Dockerfile | 5 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- enedisgateway2mqtt/Dockerfile | 5 +- enedisgateway2mqtt/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- enedisgateway2mqtt_dev/Dockerfile | 5 +- enedisgateway2mqtt_dev/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- epicgamesfree/Dockerfile | 5 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- filebrowser/Dockerfile | 5 +- filebrowser/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- fireflyiii/Dockerfile | 5 +- fireflyiii/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- fireflyiii_data_importer/Dockerfile | 5 +- fireflyiii_data_importer/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- fireflyiii_fints_importer/Dockerfile | 5 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- flaresolverr/Dockerfile | 5 +- flaresolverr/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- flexget/Dockerfile | 5 +- flexget/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- gazpar2mqtt/Dockerfile | 5 +- gazpar2mqtt/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- gitea/Dockerfile | 5 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- grav/Dockerfile | 5 +- grav/config.json | 5 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- guacamole/Dockerfile | 5 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- inadyn/Dockerfile | 5 +- inadyn/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- jackett/Dockerfile | 5 +- jackett/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- jellyfin/Dockerfile | 5 +- jellyfin/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- joal/Dockerfile | 5 +- joal/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- joplin/Dockerfile | 5 +- joplin/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- lidarr/Dockerfile | 5 +- lidarr/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- mealie/Dockerfile | 5 +- mealie/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- mylar3/Dockerfile | 5 +- mylar3/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- nextcloud/Dockerfile | 5 +- nextcloud/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- nzbget/Dockerfile | 5 +- nzbget/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- omada/Dockerfile | 5 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- omada_v3/Dockerfile | 5 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- ombi/Dockerfile | 5 +- ombi/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- organizr/Dockerfile | 5 +- organizr/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- overseerr/Dockerfile | 5 +- overseerr/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- paperless_ngx/Dockerfile | 5 +- paperless_ngx/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- papermerge/Dockerfile | 5 +- papermerge/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- photoprism/Dockerfile | 5 +- photoprism/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- piwigo/Dockerfile | 5 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- plex/Dockerfile | 5 +- plex/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- plex_meta_manager/Dockerfile | 5 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- portainer/Dockerfile | 5 +- portainer/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- prowlarr/Dockerfile | 5 +- prowlarr/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- qbittorrent/Dockerfile | 5 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- radarr/Dockerfile | 5 +- radarr/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- readarr/Dockerfile | 5 +- readarr/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- requestrr/Dockerfile | 5 +- requestrr/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- resiliosync/Dockerfile | 5 +- resiliosync/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- scrutiny/Dockerfile | 5 +- scrutiny/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- scrutiny_fa/Dockerfile | 5 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- seafile/Dockerfile | 5 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- sonarr/Dockerfile | 5 +- sonarr/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- spotweb/Dockerfile | 5 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- tandoor_recipes/Dockerfile | 5 +- tandoor_recipes/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- tdarr/Dockerfile | 5 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- teamspeak/Dockerfile | 5 +- teamspeak/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- transmission/Dockerfile | 5 +- transmission/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- transmission_openvpn/Dockerfile | 5 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- ubooquity/Dockerfile | 5 +- ubooquity/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- unpackerr/Dockerfile | 15 +----- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- webtop_kde/Dockerfile | 5 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- webtrees/Dockerfile | 5 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- whoogle/Dockerfile | 5 +- whoogle/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- xteve/Dockerfile | 5 +- xteve/config.json | 3 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- zoneminder/Dockerfile | 5 +- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ------------------- 179 files changed, 220 insertions(+), 3712 deletions(-) delete mode 100644 addons_updater/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 arpspoof/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 bazarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 bitwarden/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 booksonic_air/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 calibre/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 calibre_web/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 cloudcommander/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 code-server/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 elasticsearch/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 emby/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 enedisgateway2mqtt/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 enedisgateway2mqtt_dev/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 epicgamesfree/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 filebrowser/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 fireflyiii/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 fireflyiii_data_importer/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 fireflyiii_fints_importer/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 flaresolverr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 flexget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 gazpar2mqtt/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 gitea/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 grav/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 guacamole/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 inadyn/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 jackett/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 jellyfin/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 joal/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 joplin/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 lidarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 mealie/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 mylar3/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 nextcloud/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 nzbget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 omada/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 omada_v3/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 ombi/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 organizr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 overseerr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 paperless_ngx/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 papermerge/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 photoprism/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 piwigo/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 plex/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 plex_meta_manager/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 portainer/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 prowlarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 qbittorrent/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 radarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 readarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 requestrr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 resiliosync/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 scrutiny/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 scrutiny_fa/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 seafile/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 sonarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 spotweb/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 tandoor_recipes/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 tdarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 teamspeak/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 transmission/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 transmission_openvpn/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 ubooquity/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 unpackerr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 webtop_kde/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 webtrees/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 whoogle/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 xteve/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh delete mode 100644 zoneminder/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh diff --git a/addons_updater/Dockerfile b/addons_updater/Dockerfile index ffd8ebd06..dbd8d0b35 100644 --- a/addons_updater/Dockerfile +++ b/addons_updater/Dockerfile @@ -49,7 +49,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="" @@ -61,8 +61,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/addons_updater/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/addons_updater/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/addons_updater/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/arpspoof/Dockerfile b/arpspoof/Dockerfile index bdf92de68..dcbeb5502 100644 --- a/arpspoof/Dockerfile +++ b/arpspoof/Dockerfile @@ -49,7 +49,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="jq curl iproute2" @@ -61,8 +61,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/arpspoof/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/arpspoof/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/arpspoof/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/baikal/Dockerfile b/baikal/Dockerfile index f9c144545..9e0ed3929 100644 --- a/baikal/Dockerfile +++ b/baikal/Dockerfile @@ -48,7 +48,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ARG PACKAGES="" @@ -60,8 +60,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile index 7690f447c..6409a7cbe 100644 --- a/bazarr/Dockerfile +++ b/bazarr/Dockerfile @@ -74,7 +74,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="" @@ -86,8 +86,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/bazarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/bazarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/bazarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/bitwarden/Dockerfile b/bitwarden/Dockerfile index 6a54138f1..4efc0c6bc 100644 --- a/bitwarden/Dockerfile +++ b/bitwarden/Dockerfile @@ -56,7 +56,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="libmariadb-dev-compat \ @@ -71,8 +71,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/bitwarden/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/bitwarden/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/bitwarden/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile index 5ce5214ab..2a05b94f6 100644 --- a/booksonic_air/Dockerfile +++ b/booksonic_air/Dockerfile @@ -76,7 +76,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="jq \ @@ -91,8 +91,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/booksonic_air/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/booksonic_air/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/booksonic_air/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/calibre/Dockerfile b/calibre/Dockerfile index cd428130f..d2667992a 100644 --- a/calibre/Dockerfile +++ b/calibre/Dockerfile @@ -80,7 +80,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="" @@ -92,8 +92,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/calibre/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/calibre/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/calibre/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/calibre_web/Dockerfile b/calibre_web/Dockerfile index e0e7dfdb5..901900ac1 100644 --- a/calibre_web/Dockerfile +++ b/calibre_web/Dockerfile @@ -79,7 +79,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="" @@ -91,8 +91,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.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/calibre_web/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/calibre_web/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/calibre_web/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/cloudcommander/Dockerfile b/cloudcommander/Dockerfile index a7c7b632b..10ed3ef15 100644 --- a/cloudcommander/Dockerfile +++ b/cloudcommander/Dockerfile @@ -48,7 +48,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="jq \ @@ -63,8 +63,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/cloudcommander/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/cloudcommander/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/cloudcommander/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/code-server/Dockerfile b/code-server/Dockerfile index 910ed20f2..379c2a3da 100644 --- a/code-server/Dockerfile +++ b/code-server/Dockerfile @@ -74,7 +74,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="jq" @@ -86,8 +86,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/code-server/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/code-server/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/code-server/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index e48bc5f32..05b15d902 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -61,7 +61,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="" @@ -73,8 +73,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/elasticsearch/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/elasticsearch/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/elasticsearch/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/emby/Dockerfile b/emby/Dockerfile index 8ff6ad7c6..4e73fedaf 100644 --- a/emby/Dockerfile +++ b/emby/Dockerfile @@ -73,7 +73,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="nginx" @@ -85,8 +85,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/emby/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/emby/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index 881f79e61..000000000 --- a/emby/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -#[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -#[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/enedisgateway2mqtt/Dockerfile b/enedisgateway2mqtt/Dockerfile index 02be70dc8..df85880c7 100644 --- a/enedisgateway2mqtt/Dockerfile +++ b/enedisgateway2mqtt/Dockerfile @@ -48,7 +48,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="jq \ @@ -62,8 +62,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/enedisgateway2mqtt/config.json b/enedisgateway2mqtt/config.json index 146e8c9a5..dbea70af2 100644 --- a/enedisgateway2mqtt/config.json +++ b/enedisgateway2mqtt/config.json @@ -6,6 +6,7 @@ ], "codenotary": "alexandrep.github@gmail.com", "description": "use Enedis Gateway API to send data in your MQTT Broker (latest channel)", + "image": "ghcr.io/alexbelgium/enedisgateway2mqtt-{arch}", "map": [ "config:rw" ], @@ -28,4 +29,4 @@ "slug": "enedisgateway2mqtt", "url": "https://github.com/alexbelgium/hassio-addons", "version": "0.7.7-3" -} +} \ No newline at end of file diff --git a/enedisgateway2mqtt/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/enedisgateway2mqtt/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/enedisgateway2mqtt/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/enedisgateway2mqtt_dev/Dockerfile b/enedisgateway2mqtt_dev/Dockerfile index 3ab5cba8b..f35b2851d 100644 --- a/enedisgateway2mqtt_dev/Dockerfile +++ b/enedisgateway2mqtt_dev/Dockerfile @@ -48,7 +48,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="jq \ @@ -62,8 +62,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/enedisgateway2mqtt_dev/config.json b/enedisgateway2mqtt_dev/config.json index 3910d60ea..4d8ba2d6c 100644 --- a/enedisgateway2mqtt_dev/config.json +++ b/enedisgateway2mqtt_dev/config.json @@ -6,6 +6,7 @@ ], "codenotary": "alexandrep.github@gmail.com", "description": "use Enedis Gateway API to send data in your MQTT Broker (latest-dev channel)", + "image": "ghcr.io/alexbelgium/enedisgateway2mqtt_dev-{arch}", "map": [ "config:rw" ], @@ -24,4 +25,4 @@ "slug": "enedisgateway2mqtt_dev", "url": "https://github.com/alexbelgium/hassio-addons", "version": "0.8.2-dev" -} +} \ No newline at end of file diff --git a/enedisgateway2mqtt_dev/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/enedisgateway2mqtt_dev/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/enedisgateway2mqtt_dev/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/epicgamesfree/Dockerfile b/epicgamesfree/Dockerfile index b92636242..cd10a8c03 100644 --- a/epicgamesfree/Dockerfile +++ b/epicgamesfree/Dockerfile @@ -50,7 +50,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="" @@ -62,8 +62,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/epicgamesfree/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/epicgamesfree/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/epicgamesfree/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/filebrowser/Dockerfile b/filebrowser/Dockerfile index 29df1a168..ac0fdce09 100644 --- a/filebrowser/Dockerfile +++ b/filebrowser/Dockerfile @@ -48,7 +48,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="bind-tools \ @@ -61,8 +61,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/filebrowser/config.json b/filebrowser/config.json index 8667fcace..b2e7fb7a2 100644 --- a/filebrowser/config.json +++ b/filebrowser/config.json @@ -45,6 +45,7 @@ "PGID": "0", "PUID": "0" }, + "image": "ghcr.io/alexbelgium/filebrowser-{arch}", "ingress": true, "ingress_stream": true, "map": [ @@ -88,4 +89,4 @@ "slug": "filebrowser", "url": "https://github.com/alexbelgium/hassio-addons", "version": "2.23.0" -} +} \ No newline at end of file diff --git a/filebrowser/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/filebrowser/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/filebrowser/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/fireflyiii/Dockerfile b/fireflyiii/Dockerfile index 39c231129..1e9801c84 100644 --- a/fireflyiii/Dockerfile +++ b/fireflyiii/Dockerfile @@ -65,7 +65,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="cron mariadb-client" @@ -77,8 +77,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/fireflyiii/config.json b/fireflyiii/config.json index 1c90a32ea..00ee00e13 100644 --- a/fireflyiii/config.json +++ b/fireflyiii/config.json @@ -10,6 +10,7 @@ "environment": { "TRUSTED_PROXIES": "**" }, + "image": "ghcr.io/alexbelgium/fireflyiii-{arch}", "map": [ "config:rw", "share:rw", @@ -48,4 +49,4 @@ "url": "https://github.com/alexbelgium/hassio-addons", "version": "5.7.15-2", "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]" -} +} \ No newline at end of file diff --git a/fireflyiii/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/fireflyiii/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/fireflyiii/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/fireflyiii_data_importer/Dockerfile b/fireflyiii_data_importer/Dockerfile index 45bcdc50f..18d244080 100644 --- a/fireflyiii_data_importer/Dockerfile +++ b/fireflyiii_data_importer/Dockerfile @@ -55,7 +55,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="cron" @@ -67,8 +67,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/fireflyiii_data_importer/config.json b/fireflyiii_data_importer/config.json index e63979983..c0164ff43 100644 --- a/fireflyiii_data_importer/config.json +++ b/fireflyiii_data_importer/config.json @@ -10,6 +10,7 @@ "environment": { "TRUSTED_PROXIES": "**" }, + "image": "ghcr.io/alexbelgium/fireflyiii_data_importer-{arch}", "map": [ "config:rw", "share:rw", @@ -41,4 +42,4 @@ "url": "https://github.com/alexbelgium/hassio-addons", "version": "version-0.9.17", "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]" -} +} \ No newline at end of file diff --git a/fireflyiii_data_importer/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/fireflyiii_data_importer/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/fireflyiii_data_importer/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/fireflyiii_fints_importer/Dockerfile b/fireflyiii_fints_importer/Dockerfile index 8e408d32a..fc265aef8 100644 --- a/fireflyiii_fints_importer/Dockerfile +++ b/fireflyiii_fints_importer/Dockerfile @@ -50,7 +50,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="cron" @@ -62,8 +62,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/fireflyiii_fints_importer/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/fireflyiii_fints_importer/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/fireflyiii_fints_importer/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/flaresolverr/Dockerfile b/flaresolverr/Dockerfile index 8a1a7b892..3afecff08 100644 --- a/flaresolverr/Dockerfile +++ b/flaresolverr/Dockerfile @@ -49,7 +49,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="" @@ -61,8 +61,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/flaresolverr/config.json b/flaresolverr/config.json index 80d33a6bb..48deff1cd 100644 --- a/flaresolverr/config.json +++ b/flaresolverr/config.json @@ -6,6 +6,7 @@ ], "codenotary": "alexandrep.github@gmail.com", "description": "Proxy server to bypass Cloudflare protection", + "image": "ghcr.io/alexbelgium/flaresolverr-{arch}", "name": "FlareSolverr", "ports": { "8191/tcp": 8191 @@ -17,4 +18,4 @@ "url": "https://github.com/alexbelgium/hassio-addons", "version": "2.2.10", "webui": "[PROTO:ssl]://[HOST]:[PORT:8191]" -} +} \ No newline at end of file diff --git a/flaresolverr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/flaresolverr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/flaresolverr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/flexget/Dockerfile b/flexget/Dockerfile index 36407194a..995fd3b27 100644 --- a/flexget/Dockerfile +++ b/flexget/Dockerfile @@ -83,7 +83,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="jq \ @@ -97,8 +97,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/flexget/config.json b/flexget/config.json index a62f9713f..be1e38682 100644 --- a/flexget/config.json +++ b/flexget/config.json @@ -10,6 +10,7 @@ "FG_PLUGINS": "", "FG_WEBUI_PASSWD": "homeassistant123" }, + "image": "ghcr.io/alexbelgium/flexget-{arch}", "init": false, "map": [ "share:rw", @@ -39,4 +40,4 @@ "url": "https://github.com/alexbelgium/hassio-addons", "version": "3.5.5", "webui": "[PROTO:ssl]://[HOST]:[PORT:5050]" -} +} \ No newline at end of file diff --git a/flexget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/flexget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/flexget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/gazpar2mqtt/Dockerfile b/gazpar2mqtt/Dockerfile index e0f95eac9..cc93813e3 100644 --- a/gazpar2mqtt/Dockerfile +++ b/gazpar2mqtt/Dockerfile @@ -50,7 +50,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="" @@ -62,8 +62,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/gazpar2mqtt/config.json b/gazpar2mqtt/config.json index 3b6f91890..caa9fa9ec 100644 --- a/gazpar2mqtt/config.json +++ b/gazpar2mqtt/config.json @@ -6,6 +6,7 @@ ], "codenotary": "alexandrep.github@gmail.com", "description": "fetch GRDF data and publish data to a mqtt broker", + "image": "ghcr.io/alexbelgium/gazpar2mqtt-{arch}", "map": [ "config:rw", "share:rw" @@ -29,4 +30,4 @@ "slug": "gazpar2mqtt", "url": "https://github.com/alexbelgium/hassio-addons", "version": "0.8.2-2" -} +} \ No newline at end of file diff --git a/gazpar2mqtt/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/gazpar2mqtt/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/gazpar2mqtt/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/gitea/Dockerfile b/gitea/Dockerfile index ec9e6224e..7712f3435 100644 --- a/gitea/Dockerfile +++ b/gitea/Dockerfile @@ -50,7 +50,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="" @@ -62,8 +62,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh EXPOSE 22 3000 diff --git a/gitea/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/gitea/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/gitea/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/grav/Dockerfile b/grav/Dockerfile index efcbb54b2..00d5397fa 100644 --- a/grav/Dockerfile +++ b/grav/Dockerfile @@ -73,7 +73,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="jq \ @@ -88,8 +88,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/grav/config.json b/grav/config.json index 672b2b0bb..fb802af7f 100644 --- a/grav/config.json +++ b/grav/config.json @@ -6,7 +6,7 @@ ], "codenotary": "alexandrep.github@gmail.com", "description": "Fast, Simple, and Flexible, file-based Web-platform", - "devices": [], + "image": "ghcr.io/alexbelgium/grav-{arch}", "init": false, "map": [ "share:rw", @@ -24,7 +24,6 @@ "ports_description": { "80/tcp": "web interface" }, - "privileged": [], "schema": { "PGID": "int", "PUID": "int", @@ -34,4 +33,4 @@ "url": "https://github.com/alexbelgium/hassio-addons", "version": "1.7.37.1", "webui": "[PROTO:ssl]://[HOST]:[PORT:80]" -} +} \ No newline at end of file diff --git a/grav/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/grav/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/grav/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/guacamole/Dockerfile b/guacamole/Dockerfile index b93cf5bb4..03ea257e1 100644 --- a/guacamole/Dockerfile +++ b/guacamole/Dockerfile @@ -75,7 +75,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="" @@ -87,8 +87,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/guacamole/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/guacamole/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/guacamole/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/inadyn/Dockerfile b/inadyn/Dockerfile index 8f3a67bf3..bcf194863 100644 --- a/inadyn/Dockerfile +++ b/inadyn/Dockerfile @@ -51,7 +51,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="curl \ @@ -66,8 +66,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh # Install mustache # spellcheck disable=SC2015 diff --git a/inadyn/config.json b/inadyn/config.json index 2ceb4718d..9a6c9b02f 100644 --- a/inadyn/config.json +++ b/inadyn/config.json @@ -7,6 +7,7 @@ "codenotary": "alexandrep.github@gmail.com", "description": "Inadyn is a small and simple Dynamic DNS, DDNS, client with HTTPS support. A large number of dynamic dns providers are supported (https://github.com/troglobit/inadyn#supported-providers). For those that are not, you can use a custom provider as per this project's documentation (https://github.com/nalipaz/hassio-addons/blob/master/README.md)", "host_network": true, + "image": "ghcr.io/alexbelgium/inadyn-{arch}", "map": [ "ssl" ], @@ -55,4 +56,4 @@ "slug": "inadyn", "url": "https://github.com/alexbelgium/hassio-addons", "version": "2.10.0" -} +} \ No newline at end of file diff --git a/inadyn/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/inadyn/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/inadyn/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/jackett/Dockerfile b/jackett/Dockerfile index dae577fb6..d5701e562 100644 --- a/jackett/Dockerfile +++ b/jackett/Dockerfile @@ -76,7 +76,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="curl" @@ -88,8 +88,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/jackett/config.json b/jackett/config.json index 78f928e60..bc698695d 100644 --- a/jackett/config.json +++ b/jackett/config.json @@ -10,6 +10,7 @@ "PGID": "0", "PUID": "0" }, + "image": "ghcr.io/alexbelgium/jackett_nas-{arch}", "init": false, "map": [ "config:rw", @@ -45,4 +46,4 @@ "url": "https://github.com/alexbelgium/hassio-addons/tree/master/jackett", "version": "0.20.2288", "webui": "[PROTO:ssl]://[HOST]:[PORT:9117]" -} +} \ No newline at end of file diff --git a/jackett/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/jackett/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index 881f79e61..000000000 --- a/jackett/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -#[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -#[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile index 9b9f2acf6..881bd57a2 100644 --- a/jellyfin/Dockerfile +++ b/jellyfin/Dockerfile @@ -74,7 +74,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="nginx intel-media-va-driver-non-free" @@ -86,8 +86,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/jellyfin/config.json b/jellyfin/config.json index 386a253b4..ee600000b 100644 --- a/jellyfin/config.json +++ b/jellyfin/config.json @@ -55,6 +55,7 @@ ], "host_dbus": true, "host_network": true, + "image": "ghcr.io/alexbelgium/jellyfin-{arch}", "ingress": true, "ingress_port": 0, "ingress_stream": true, @@ -106,4 +107,4 @@ "url": "https://github.com/alexbelgium/hassio-addons", "version": "10.8.7-1-ls189", "video": true -} +} \ No newline at end of file diff --git a/jellyfin/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/jellyfin/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/jellyfin/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/joal/Dockerfile b/joal/Dockerfile index 179521ccf..c22153cde 100644 --- a/joal/Dockerfile +++ b/joal/Dockerfile @@ -62,8 +62,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh # Modules ARG MODULES="00-banner.sh" @@ -74,7 +73,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d ################ # 4 Entrypoint # diff --git a/joal/config.json b/joal/config.json index 5e0f9f433..54b65cf01 100644 --- a/joal/config.json +++ b/joal/config.json @@ -7,6 +7,7 @@ "codenotary": "alexandrep.github@gmail.com", "description": "An open source command line RatioMaster with WebUI", "hassio_api": true, + "image": "ghcr.io/alexbelgium/joal-{arch}", "ingress": true, "map": [ "config:rw" @@ -35,4 +36,4 @@ "slug": "joal", "url": "https://github.com/alexbelgium/hassio-addons", "version": "2.1.32" -} +} \ No newline at end of file diff --git a/joal/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/joal/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/joal/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/joplin/Dockerfile b/joplin/Dockerfile index 40168215d..fdeaa0306 100644 --- a/joplin/Dockerfile +++ b/joplin/Dockerfile @@ -55,7 +55,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="jq \ @@ -68,8 +68,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/joplin/config.json b/joplin/config.json index 1e706a0bc..12ad77a0e 100644 --- a/joplin/config.json +++ b/joplin/config.json @@ -9,6 +9,7 @@ "environment": { "APP_PORT": "22300" }, + "image": "ghcr.io/alexbelgium/joplin-{arch}", "map": [ "config:rw", "share:rw" @@ -49,4 +50,4 @@ "url": "https://github.com/alexbelgium/hassio-addons", "version": "2.9.7-3", "webui": "[PROTO:ssl]://[HOST]:[PORT:22300]" -} +} \ No newline at end of file diff --git a/joplin/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/joplin/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/joplin/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile index c100f3b5a..0ab01279d 100644 --- a/lidarr/Dockerfile +++ b/lidarr/Dockerfile @@ -73,7 +73,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="jq \ @@ -88,8 +88,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/lidarr/config.json b/lidarr/config.json index bb7bbc665..8528ec111 100644 --- a/lidarr/config.json +++ b/lidarr/config.json @@ -45,6 +45,7 @@ "PGID": "0", "PUID": "0" }, + "image": "ghcr.io/alexbelgium/lidarr_nas-{arch}", "init": false, "map": [ "config:rw", @@ -83,4 +84,4 @@ "url": "https://github.com/alexbelgium/hassio-addons/blob/master/lidarr/Readme.md", "version": "1.0.2.2592-ls103", "webui": "[PROTO:ssl]://[HOST]:[PORT:8686]" -} +} \ No newline at end of file diff --git a/lidarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/lidarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/lidarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/mealie/Dockerfile b/mealie/Dockerfile index 26af43632..8bd19e828 100644 --- a/mealie/Dockerfile +++ b/mealie/Dockerfile @@ -52,7 +52,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="jq curl bash" @@ -64,8 +64,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/mealie/config.json b/mealie/config.json index f9fe46c3a..c3eabe729 100644 --- a/mealie/config.json +++ b/mealie/config.json @@ -9,6 +9,7 @@ "APP_PORT": "9925", "DB_ENGINE": "sqlite" }, + "image": "ghcr.io/alexbelgium/mealie-{arch}", "map": [ "config:rw", "share:rw", @@ -41,4 +42,4 @@ "url": "https://github.com/alexbelgium/hassio-addons", "version": "1.0.0.1-2", "webui": "[PROTO:ssl]://[HOST]:[PORT:9925]" -} +} \ No newline at end of file diff --git a/mealie/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/mealie/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/mealie/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/mylar3/Dockerfile b/mylar3/Dockerfile index 5e1dabb61..11e3bc376 100644 --- a/mylar3/Dockerfile +++ b/mylar3/Dockerfile @@ -73,7 +73,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="" @@ -85,8 +85,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/mylar3/config.json b/mylar3/config.json index 30a5ccec6..585165969 100644 --- a/mylar3/config.json +++ b/mylar3/config.json @@ -44,6 +44,7 @@ "PGID": "0", "PUID": "0" }, + "image": "ghcr.io/alexbelgium/mylar3-{arch}", "init": false, "map": [ "config:rw", @@ -79,4 +80,4 @@ "url": "https://github.com/alexbelgium/hassio-addons", "version": "0.6.9-bugfix", "webui": "[PROTO:ssl]://[HOST]:[PORT:8090]" -} +} \ No newline at end of file diff --git a/mylar3/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/mylar3/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/mylar3/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index fdbf4c505..f134d2d42 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -76,7 +76,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="curl jq wget" @@ -88,8 +88,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh VOLUME ["/share", "/ssl", "/data", "/media"] diff --git a/nextcloud/config.json b/nextcloud/config.json index ae6bcbe58..8f928a300 100644 --- a/nextcloud/config.json +++ b/nextcloud/config.json @@ -42,6 +42,7 @@ "/dev/nvme2" ], "hassio_api": true, + "image": "ghcr.io/alexbelgium/nextcloud_ocr-{arch}", "ingress_port": 0, "init": false, "map": [ @@ -105,4 +106,4 @@ "url": "https://github.com/alexbelgium/hassio-addons/tree/master/nextcloud", "version": "25.0.0-10", "webui": "https://[HOST]:[PORT:443]" -} +} \ No newline at end of file diff --git a/nextcloud/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/nextcloud/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/nextcloud/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/nzbget/Dockerfile b/nzbget/Dockerfile index b84c98dd7..a6fd70ee7 100644 --- a/nzbget/Dockerfile +++ b/nzbget/Dockerfile @@ -73,7 +73,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="nginx" @@ -85,8 +85,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/nzbget/config.json b/nzbget/config.json index a40be77f6..0ce9a8c88 100644 --- a/nzbget/config.json +++ b/nzbget/config.json @@ -44,6 +44,7 @@ "PGID": "0", "PUID": "0" }, + "image": "ghcr.io/alexbelgium/nzbget-{arch}", "ingress": true, "init": false, "map": [ @@ -80,4 +81,4 @@ "slug": "nzbget", "url": "https://github.com/alexbelgium/hassio-addons", "version": "v21.1-ls132" -} +} \ No newline at end of file diff --git a/nzbget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/nzbget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/nzbget/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/omada/Dockerfile b/omada/Dockerfile index c888a1c43..c09f06d5a 100644 --- a/omada/Dockerfile +++ b/omada/Dockerfile @@ -56,7 +56,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="" @@ -68,8 +68,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/omada/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/omada/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/omada/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/omada_v3/Dockerfile b/omada_v3/Dockerfile index d3cdb1fdf..660b63dd4 100644 --- a/omada_v3/Dockerfile +++ b/omada_v3/Dockerfile @@ -57,7 +57,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="" @@ -69,8 +69,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/omada_v3/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/omada_v3/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/omada_v3/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/ombi/Dockerfile b/ombi/Dockerfile index dd017b4e3..eb318549b 100644 --- a/ombi/Dockerfile +++ b/ombi/Dockerfile @@ -73,7 +73,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="jq curl" @@ -85,8 +85,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/ombi/config.json b/ombi/config.json index 5053ea273..8cfb8a606 100644 --- a/ombi/config.json +++ b/ombi/config.json @@ -6,6 +6,7 @@ ], "codenotary": "alexandrep.github@gmail.com", "description": "Self-hosted Plex Request and user management system", + "image": "ghcr.io/alexbelgium/ombi-{arch}", "init": false, "map": [ "config:rw" @@ -29,4 +30,4 @@ "url": "https://github.com/alexbelgium/hassio-addons/tree/master/ombi", "version": "4.22.5-bugfix", "webui": "[PROTO:ssl]://[HOST]:[PORT:3579]" -} +} \ No newline at end of file diff --git a/ombi/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/ombi/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/ombi/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/organizr/Dockerfile b/organizr/Dockerfile index 296acf255..dcae08dc9 100644 --- a/organizr/Dockerfile +++ b/organizr/Dockerfile @@ -72,7 +72,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="curl \ @@ -85,8 +85,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/organizr/config.json b/organizr/config.json index 016846dda..1e2d4bdbe 100644 --- a/organizr/config.json +++ b/organizr/config.json @@ -6,6 +6,7 @@ ], "codenotary": "alexandrep.github@gmail.com", "description": "An HTPC/Homelab services organizer that is written in PHP", + "image": "ghcr.io/alexbelgium/organizr-{arch}", "map": [ "config:rw", "ssl" @@ -29,4 +30,4 @@ "url": "https://github.com/alexbelgium/hassio-addons", "version": "1.90-bugfix2", "webui": "[PROTO:ssl]://[HOST]:[PORT:80]" -} +} \ No newline at end of file diff --git a/organizr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/organizr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/organizr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/overseerr/Dockerfile b/overseerr/Dockerfile index e93238e0e..8746eccc0 100644 --- a/overseerr/Dockerfile +++ b/overseerr/Dockerfile @@ -74,7 +74,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="" @@ -86,8 +86,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/overseerr/config.json b/overseerr/config.json index 8d46c63c1..91f5d161a 100644 --- a/overseerr/config.json +++ b/overseerr/config.json @@ -8,6 +8,7 @@ "description": "Request management and media discovery tool built to work with your existing Plex ecosystem", "devices": [], "environment": {}, + "image": "ghcr.io/alexbelgium/overseerr-{arch}", "init": false, "map": [ "config:rw" @@ -35,4 +36,4 @@ "url": "https://github.com/alexbelgium/hassio-addons/tree/master/overseerr", "version": "1.30.1-2", "webui": "[PROTO:ssl]://[HOST]:[PORT:5055]" -} +} \ No newline at end of file diff --git a/overseerr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/overseerr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/overseerr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile index 4ab82ff18..9da83ee12 100644 --- a/paperless_ngx/Dockerfile +++ b/paperless_ngx/Dockerfile @@ -54,7 +54,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="redis-server yamllint pip libxml2-dev libxslt-dev python-dev libjpeg-dev zlib1g-dev python3-dev build-essential" @@ -66,8 +66,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/paperless_ngx/config.json b/paperless_ngx/config.json index 06e83fe55..dc0ea60ff 100644 --- a/paperless_ngx/config.json +++ b/paperless_ngx/config.json @@ -47,6 +47,7 @@ "PUID": "0" }, "homeassistant": "0.92.0b2", + "image": "ghcr.io/alexbelgium/paperless_ng-{arch}", "init": false, "map": [ "config:rw", @@ -88,4 +89,4 @@ "url": "https://github.com/alexbelgium/hassio-addons", "version": "1.9.2-11", "webui": "[PROTO:ssl]://[HOST]:[PORT:8000]" -} +} \ No newline at end of file diff --git a/paperless_ngx/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/paperless_ngx/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/paperless_ngx/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile index cd7724fa4..85ec06cd7 100644 --- a/papermerge/Dockerfile +++ b/papermerge/Dockerfile @@ -80,7 +80,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="jq \ @@ -95,8 +95,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/papermerge/config.json b/papermerge/config.json index ef1e4452d..8e4b9f7e0 100644 --- a/papermerge/config.json +++ b/papermerge/config.json @@ -6,6 +6,7 @@ ], "codenotary": "alexandrep.github@gmail.com", "description": "Open source document management system (DMS)", + "image": "ghcr.io/alexbelgium/papermerge-{arch}", "init": false, "map": [ "share:rw", @@ -52,4 +53,4 @@ "url": "https://github.com/alexbelgium/hassio-addons", "version": "v2.0.1-ls60-bugfix", "webui": "[PROTO:ssl]://[HOST]:[PORT:8000]" -} +} \ No newline at end of file diff --git a/papermerge/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/papermerge/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/papermerge/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/photoprism/Dockerfile b/photoprism/Dockerfile index 895aa56d9..fe2cea9d6 100644 --- a/photoprism/Dockerfile +++ b/photoprism/Dockerfile @@ -61,7 +61,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="jq \ @@ -78,8 +78,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/photoprism/config.json b/photoprism/config.json index 2b8633d07..1af9ac085 100644 --- a/photoprism/config.json +++ b/photoprism/config.json @@ -45,6 +45,7 @@ "working_dir": "/data/photoprism" }, "homeassistant": "0.92.0b2", + "image": "ghcr.io/alexbelgium/photoprism-{arch}", "ingress": true, "ingress_stream": true, "map": [ @@ -99,4 +100,4 @@ "slug": "photoprism", "url": "https://github.com/alexbelgium/hassio-addons-test", "version": "20220121-2" -} +} \ No newline at end of file diff --git a/photoprism/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/photoprism/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/photoprism/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile index 36ee4368c..70c20a9d3 100644 --- a/piwigo/Dockerfile +++ b/piwigo/Dockerfile @@ -73,7 +73,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="jq \ @@ -87,8 +87,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/piwigo/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/piwigo/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/piwigo/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/plex/Dockerfile b/plex/Dockerfile index 954fbd7f6..9497e2631 100644 --- a/plex/Dockerfile +++ b/plex/Dockerfile @@ -83,7 +83,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="jq \ @@ -97,8 +97,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/plex/config.json b/plex/config.json index f6a7c9d76..bff96088b 100644 --- a/plex/config.json +++ b/plex/config.json @@ -56,6 +56,7 @@ "VERSION": "docker" }, "host_network": true, + "image": "ghcr.io/alexbelgium/plex_nas-{arch}", "init": false, "map": [ "share:rw", @@ -115,4 +116,4 @@ "version": "1.29.2.6364-6d72b0cf6-ls144", "video": true, "webui": "[PROTO:ssl]://[HOST]:[PORT:32400]/web" -} +} \ No newline at end of file diff --git a/plex/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/plex/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/plex/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/plex_meta_manager/Dockerfile b/plex_meta_manager/Dockerfile index 4ee595860..31b81a5dd 100644 --- a/plex_meta_manager/Dockerfile +++ b/plex_meta_manager/Dockerfile @@ -81,7 +81,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="" @@ -93,8 +93,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/plex_meta_manager/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/plex_meta_manager/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/plex_meta_manager/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/portainer/Dockerfile b/portainer/Dockerfile index c838f1b1b..e95385748 100644 --- a/portainer/Dockerfile +++ b/portainer/Dockerfile @@ -72,7 +72,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="nginx" @@ -84,8 +84,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/portainer/config.json b/portainer/config.json index 9753693d5..ec7d5309d 100644 --- a/portainer/config.json +++ b/portainer/config.json @@ -12,6 +12,7 @@ "description": "Manage your Docker environment with ease", "docker_api": true, "hassio_api": true, + "image": "ghcr.io/alexbelgium/portainer-{arch}", "ingress": true, "ingress_port": 1337, "ingress_stream": true, @@ -45,4 +46,4 @@ "slug": "portainer", "url": "https://github.com/alexbelgium/hassio-addons", "version": "2.16.2" -} +} \ No newline at end of file diff --git a/portainer/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/portainer/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index 3b6bbf074..000000000 --- a/portainer/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -#if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then -# for scripts in $MODULES; do -# echo "$scripts : executing" -# chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" -# chmod a+x /etc/cont-init.d/"$scripts" -# /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" -# rm /etc/cont-init.d/"$scripts" -# done | tac -#fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile index 1c1c58978..c1a9a1b50 100644 --- a/prowlarr/Dockerfile +++ b/prowlarr/Dockerfile @@ -73,7 +73,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="jq \ @@ -88,8 +88,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/prowlarr/config.json b/prowlarr/config.json index 3ef554728..b608f82a1 100644 --- a/prowlarr/config.json +++ b/prowlarr/config.json @@ -54,6 +54,7 @@ "PGID": "0", "PUID": "0" }, + "image": "ghcr.io/alexbelgium/prowlarr-{arch}", "init": false, "map": [ "config:rw", @@ -94,4 +95,4 @@ "url": "https://github.com/alexbelgium/hassio-addons", "version": "nightly-0.4.10.2096-ls445", "webui": "[PROTO:ssl]://[HOST]:[PORT:9696]" -} +} \ No newline at end of file diff --git a/prowlarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/prowlarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/prowlarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile index 65bbcd6e1..1f6e008b8 100644 --- a/qbittorrent/Dockerfile +++ b/qbittorrent/Dockerfile @@ -90,7 +90,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d #RUN if [ -f /etc/s6-overlay/s6-rc.d/init-adduser ]; then for SCRIPTS in /etc/cont-init.d/*; do [ -e "$SCRIPTS" ] || continue \ # && mkdir -p /abscripts && sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS" \ @@ -108,8 +108,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh # Switch scripts from s6 v2 to v3 #RUN if [ -f /etc/s6-overlay/s6-rc.d/init-custom-files/run ]; then mkdir "/custom-cont-init.d" && for SCRIPTS in /etc/cont-init.d/*; do [ -e "$SCRIPTS" ] || continue \ diff --git a/qbittorrent/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/qbittorrent/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/qbittorrent/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/radarr/Dockerfile b/radarr/Dockerfile index bf7efc0b4..88fc9955e 100644 --- a/radarr/Dockerfile +++ b/radarr/Dockerfile @@ -73,7 +73,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV BASHIO_VERSION=0.14.3 @@ -89,8 +89,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/radarr/config.json b/radarr/config.json index 99a79929c..a853ee7be 100644 --- a/radarr/config.json +++ b/radarr/config.json @@ -44,6 +44,7 @@ "PGID": "0", "PUID": "0" }, + "image": "ghcr.io/alexbelgium/radarr_nas-{arch}", "init": false, "map": [ "config:rw", @@ -83,4 +84,4 @@ "url": "https://github.com/alexbelgium/hassio-addons/tree/master/radarr", "version": "4.2.4.6635", "webui": "[PROTO:ssl]://[HOST]:[PORT:7878]" -} +} \ No newline at end of file diff --git a/radarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/radarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/radarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/readarr/Dockerfile b/readarr/Dockerfile index 10fe36e94..943194403 100644 --- a/readarr/Dockerfile +++ b/readarr/Dockerfile @@ -74,7 +74,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="" @@ -86,8 +86,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/readarr/config.json b/readarr/config.json index f7b984ea8..2cd6c1fe7 100644 --- a/readarr/config.json +++ b/readarr/config.json @@ -44,6 +44,7 @@ "PGID": "0", "PUID": "0" }, + "image": "ghcr.io/alexbelgium/readarr_nas-{arch}", "init": false, "map": [ "config:rw", @@ -80,4 +81,4 @@ "url": "https://github.com/alexbelgium/hassio-addons/tree/master/readarr", "version": "nightly-0.1.1.1459-ls144", "webui": "[PROTO:ssl]://[HOST]:[PORT:8787]" -} +} \ No newline at end of file diff --git a/readarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/readarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/readarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile index da14ea4c6..c6c5cd9ee 100644 --- a/requestrr/Dockerfile +++ b/requestrr/Dockerfile @@ -73,7 +73,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="jq \ @@ -88,8 +88,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/requestrr/config.json b/requestrr/config.json index 31034ae99..f3eb55db6 100644 --- a/requestrr/config.json +++ b/requestrr/config.json @@ -10,6 +10,7 @@ "PGID": "0", "PUID": "0" }, + "image": "ghcr.io/alexbelgium/requestrr-{arch}", "init": false, "map": [], "name": "Requestrr", @@ -36,4 +37,4 @@ "url": "https://github.com/alexbelgium/hassio-addons", "version": "2.1.2-3-bugfix", "webui": "[PROTO:ssl]://[HOST]:[PORT:4545]" -} +} \ No newline at end of file diff --git a/requestrr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/requestrr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/requestrr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile index 1b2fb74d6..001dbaa15 100644 --- a/resiliosync/Dockerfile +++ b/resiliosync/Dockerfile @@ -87,7 +87,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="jq \ @@ -103,8 +103,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/resiliosync/config.json b/resiliosync/config.json index 4dcabd489..863c70cd9 100644 --- a/resiliosync/config.json +++ b/resiliosync/config.json @@ -41,6 +41,7 @@ "/dev/nvme1", "/dev/nvme2" ], + "image": "ghcr.io/alexbelgium/resiliosync-{arch}", "ingress": true, "init": false, "map": [ @@ -85,4 +86,4 @@ "slug": "resiliosync", "url": "https://github.com/tyjtyj/hassio-addons", "version": "2.7.3-5" -} +} \ No newline at end of file diff --git a/resiliosync/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/resiliosync/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/resiliosync/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/scrutiny/Dockerfile b/scrutiny/Dockerfile index beb86aa05..eeeeb6ed3 100644 --- a/scrutiny/Dockerfile +++ b/scrutiny/Dockerfile @@ -48,7 +48,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="jq \ @@ -63,8 +63,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/scrutiny/config.json b/scrutiny/config.json index 939b2e7f5..b4bf086b9 100644 --- a/scrutiny/config.json +++ b/scrutiny/config.json @@ -47,6 +47,7 @@ "COLLECTOR_API_ENDPOINT": "http://localhost:8080", "COLLECTOR_HOST_ID": "home_assistant" }, + "image": "ghcr.io/alexbelgium/scrutiny-{arch}", "ingress": true, "init": false, "map": [ @@ -84,4 +85,4 @@ "udev": true, "url": "https://github.com/AnalogJ/scrutiny", "version": "v0.5.0-5" -} +} \ No newline at end of file diff --git a/scrutiny/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/scrutiny/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/scrutiny/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/scrutiny_fa/Dockerfile b/scrutiny_fa/Dockerfile index beb86aa05..eeeeb6ed3 100644 --- a/scrutiny_fa/Dockerfile +++ b/scrutiny_fa/Dockerfile @@ -48,7 +48,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="jq \ @@ -63,8 +63,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/scrutiny_fa/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/scrutiny_fa/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/scrutiny_fa/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/seafile/Dockerfile b/seafile/Dockerfile index cb5875745..60b749303 100644 --- a/seafile/Dockerfile +++ b/seafile/Dockerfile @@ -53,7 +53,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="" @@ -65,8 +65,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/seafile/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/seafile/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/seafile/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile index d30423b0c..b093f6a5e 100644 --- a/sonarr/Dockerfile +++ b/sonarr/Dockerfile @@ -74,7 +74,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="jq \ @@ -89,8 +89,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/sonarr/config.json b/sonarr/config.json index 1878ba888..df74823aa 100644 --- a/sonarr/config.json +++ b/sonarr/config.json @@ -44,6 +44,7 @@ "PGID": "0", "PUID": "0" }, + "image": "ghcr.io/alexbelgium/sonarr_nas-{arch}", "init": false, "map": [ "config:rw", @@ -83,4 +84,4 @@ "url": "https://github.com/alexbelgium/hassio-addons/tree/master/sonarr", "version": "3.0.9.1549-2-bugfix", "webui": "[PROTO:ssl]://[HOST]:[PORT:8989]" -} +} \ No newline at end of file diff --git a/sonarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/sonarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/sonarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/spotweb/Dockerfile b/spotweb/Dockerfile index 4e21bc2a9..c82279daf 100644 --- a/spotweb/Dockerfile +++ b/spotweb/Dockerfile @@ -105,7 +105,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="" @@ -117,8 +117,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/spotweb/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/spotweb/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/spotweb/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/tandoor_recipes/Dockerfile b/tandoor_recipes/Dockerfile index 58374f7bb..8a506468e 100644 --- a/tandoor_recipes/Dockerfile +++ b/tandoor_recipes/Dockerfile @@ -49,7 +49,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="nginx" @@ -61,8 +61,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/tandoor_recipes/config.json b/tandoor_recipes/config.json index aa3805e43..b16b900f3 100644 --- a/tandoor_recipes/config.json +++ b/tandoor_recipes/config.json @@ -12,6 +12,7 @@ "POSTGRES_DB": "/config/addons_config/tandoor_recipes/recipes.db", "TRUSTED_PROXIES": "**" }, + "image": "ghcr.io/alexbelgium/tandoor_recipes-{arch}", "map": [ "config:rw" ], @@ -45,4 +46,4 @@ "slug": "tandoor_recipes", "url": "https://github.com/alexbelgium/hassio-addons", "version": "1.4.5" -} +} \ No newline at end of file diff --git a/tandoor_recipes/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/tandoor_recipes/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/tandoor_recipes/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/tdarr/Dockerfile b/tdarr/Dockerfile index 7db63e388..f3b3d1d4a 100644 --- a/tdarr/Dockerfile +++ b/tdarr/Dockerfile @@ -48,7 +48,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="libgles2-mesa libgles2-mesa-dev xorg-dev" @@ -60,8 +60,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/tdarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/tdarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/tdarr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/teamspeak/Dockerfile b/teamspeak/Dockerfile index 0116db5d1..b7e28ac2f 100644 --- a/teamspeak/Dockerfile +++ b/teamspeak/Dockerfile @@ -54,7 +54,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="" @@ -66,8 +66,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/teamspeak/config.json b/teamspeak/config.json index 7968b5b84..415d889b2 100644 --- a/teamspeak/config.json +++ b/teamspeak/config.json @@ -15,6 +15,7 @@ "TS3SERVER_LICENSE": "accept", "TS_UPDATE": "1" }, + "image": "ghcr.io/alexbelgium/teamspeak-{arch}", "init": false, "map": [ "share:rw" @@ -35,4 +36,4 @@ "slug": "teamspeak", "url": "https://github.com/alexbelgium/hassio-addons", "version": "3.13.6-6" -} +} \ No newline at end of file diff --git a/teamspeak/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/teamspeak/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/teamspeak/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/transmission/Dockerfile b/transmission/Dockerfile index 4aafd6309..72f7beb7e 100644 --- a/transmission/Dockerfile +++ b/transmission/Dockerfile @@ -83,7 +83,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="nginx" @@ -95,8 +95,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/transmission/config.json b/transmission/config.json index 4a0018845..0379b483b 100644 --- a/transmission/config.json +++ b/transmission/config.json @@ -44,6 +44,7 @@ "environment": { "TRANSMISSION_WEB_HOME": "/transmission-web-control/" }, + "image": "ghcr.io/alexbelgium/transmission_ls-{arch}", "ingress": true, "init": false, "map": [ @@ -97,4 +98,4 @@ "slug": "transmission_ls", "url": "https://github.com/alexbelgium/hassio-addons", "version": "3.00-r6-ls143" -} +} \ No newline at end of file diff --git a/transmission/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/transmission/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/transmission/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/transmission_openvpn/Dockerfile b/transmission_openvpn/Dockerfile index 7c20a3eb1..698e767cd 100644 --- a/transmission_openvpn/Dockerfile +++ b/transmission_openvpn/Dockerfile @@ -78,7 +78,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="nginx" @@ -90,8 +90,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/transmission_openvpn/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/transmission_openvpn/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/transmission_openvpn/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile index d3246323c..ea80ecfe5 100644 --- a/ubooquity/Dockerfile +++ b/ubooquity/Dockerfile @@ -83,7 +83,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="curl \ @@ -98,8 +98,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/ubooquity/config.json b/ubooquity/config.json index 716540459..56e0c5adc 100644 --- a/ubooquity/config.json +++ b/ubooquity/config.json @@ -40,6 +40,7 @@ "/dev/nvme1", "/dev/nvme2" ], + "image": "ghcr.io/alexbelgium/ubooquity-{arch}", "init": false, "map": [ "media:rw", @@ -88,4 +89,4 @@ "url": "https://github.com/alexbelgium/hassio-addons", "version": "2.1.2-11", "webui": "[PROTO:ssl]://[HOST]:[PORT:2206]/ubooquity/admin" -} +} \ No newline at end of file diff --git a/ubooquity/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/ubooquity/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/ubooquity/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/unpackerr/Dockerfile b/unpackerr/Dockerfile index 922c121b0..546806923 100644 --- a/unpackerr/Dockerfile +++ b/unpackerr/Dockerfile @@ -67,13 +67,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "testing-abb5d4e-2022-09-21" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE - -#RUN if [ -f /etc/s6-overlay/s6-rc.d/init-adduser ]; then for SCRIPTS in /etc/cont-init.d/*; do [ -e "$SCRIPTS" ] || continue \ -# && mkdir -p /abscripts && sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS" \ -# && SCRIPTSNAME="$(basename "$SCRIPTS")" && mkdir /etc/s6-overlay/s6-rc.d/"$SCRIPTSNAME" && mv "$SCRIPTS" /etc/s6-overlay/s6-rc.d/"$SCRIPTSNAME"/run \ -# && echo "oneshot" > /etc/s6-overlay/s6-rc.d/"$SCRIPTSNAME"/type && echo "/etc/s6-overlay/s6-rc.d/$SCRIPTSNAME/run" > /etc/s6-overlay/s6-rc.d/"$SCRIPTSNAME"/up \ -# && chmod a+x /etc/s6-overlay/s6-rc.d/$SCRIPTSNAME/* ; done; fi + && chmod -R 755 /etc/cont-init.d # Manual apps ARG PACKAGES="" @@ -85,12 +79,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) - -# Switch scripts from s6 v2 to v3 -#RUN if [ -f /etc/s6-overlay/s6-rc.d/init-custom-files/run ]; then mkdir "/custom-cont-init.d" && for SCRIPTS in /etc/cont-init.d/*; do [ -e "$SCRIPTS" ] || continue \ -# && mv "$SCRIPTS" /custom-cont-init.d && chmod a+x /custom-cont-init.d/*; done; fi + && rm /automatic_packages.sh # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ diff --git a/unpackerr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/unpackerr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/unpackerr/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/webtop_kde/Dockerfile b/webtop_kde/Dockerfile index 22c24f6ab..0cd384b1f 100644 --- a/webtop_kde/Dockerfile +++ b/webtop_kde/Dockerfile @@ -86,7 +86,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="nginx engrampa" @@ -98,8 +98,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/webtop_kde/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/webtop_kde/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/webtop_kde/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/webtrees/Dockerfile b/webtrees/Dockerfile index 78bfd76cf..863bf8aed 100644 --- a/webtrees/Dockerfile +++ b/webtrees/Dockerfile @@ -59,7 +59,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="jq \ @@ -73,8 +73,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/webtrees/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/webtrees/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/webtrees/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/whoogle/Dockerfile b/whoogle/Dockerfile index 0820fef83..420a08d12 100644 --- a/whoogle/Dockerfile +++ b/whoogle/Dockerfile @@ -50,7 +50,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="" @@ -62,8 +62,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/whoogle/config.json b/whoogle/config.json index 11337e9de..9f26aa785 100644 --- a/whoogle/config.json +++ b/whoogle/config.json @@ -7,6 +7,7 @@ "codenotary": "alexandrep.github@gmail.com", "description": "Self-hosted, ad-free, privacy-respecting metasearch engine", "devices": [], + "image": "ghcr.io/alexbelgium/whoogle-search-{arch}", "ingress": true, "ingress_stream": true, "map": [ @@ -61,4 +62,4 @@ "slug": "whoogle-search", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/whoogle", "version": "0.8.0" -} +} \ No newline at end of file diff --git a/whoogle/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/whoogle/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/whoogle/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/xteve/Dockerfile b/xteve/Dockerfile index c8377e1e9..873457488 100644 --- a/xteve/Dockerfile +++ b/xteve/Dockerfile @@ -53,7 +53,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="" @@ -65,8 +65,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/xteve/config.json b/xteve/config.json index 6e9734ae1..49a16b9f8 100644 --- a/xteve/config.json +++ b/xteve/config.json @@ -11,6 +11,7 @@ "XTEVE_HOME": "/data" }, "host_network": true, + "image": "ghcr.io/alexbelgium/xteve-{arch}", "map": [ "config:rw", "share:rw", @@ -27,4 +28,4 @@ "url": "https://github.com/alexbelgium/hassio-addons", "version": "2.5.3-2", "webui": "[PROTO:ssl]://[HOST]:[PORT:34400]/web" -} +} \ No newline at end of file diff --git a/xteve/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/xteve/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/xteve/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d diff --git a/zoneminder/Dockerfile b/zoneminder/Dockerfile index 7ad573eac..014b2ec75 100644 --- a/zoneminder/Dockerfile +++ b/zoneminder/Dockerfile @@ -56,7 +56,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE + && chmod -R 755 /etc/cont-init.d # Manual apps ENV PACKAGES="" @@ -68,8 +68,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && 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; \ - if [ -f /etc/s6-overlay/s6-rc.d/00-legacy/up ]; then chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh && sed -i "1i /./etc/cont-init.d/00-aaa_dockerfile_backup.sh" /etc/s6-overlay/s6-rc.d/00-legacy/up;fi) + && rm /automatic_packages.sh ################ # 4 Entrypoint # diff --git a/zoneminder/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/zoneminder/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh deleted file mode 100644 index b983e4efc..000000000 --- a/zoneminder/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# If dockerfile failed install manually - -############################## -# Automatic modules download # -############################## -if [ -e "/MODULESFILE" ]; then - MODULES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d -fi - -####################### -# Automatic installer # -####################### -if [ -e "/ENVFILE" ]; then - PACKAGES=$(/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh -fi - -if [ -e "/MODULESFILE" ] && [ ! -f /entrypoint.sh ]; then - for scripts in $MODULES; do - echo "$scripts : executing" - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/"$scripts" - chmod a+x /etc/cont-init.d/"$scripts" - /./etc/cont-init.d/"$scripts" || echo "/etc/cont-init.d/$scripts: exiting $?" - rm /etc/cont-init.d/"$scripts" - done | tac -fi - -####################### -# Correct permissions # -####################### -[ -d /etc/services.d ] && chmod -R 777 /etc/services.d -[ -d /etc/cont-init.d ] && chmod -R 777 /etc/cont-init.d