From 6db3f63ccd2b48f46a1df174cb9f65f13f8641f6 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 13 Jan 2022 22:13:32 +0100 Subject: [PATCH] Update Dockerfile --- addons_updater/Dockerfile | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/addons_updater/Dockerfile b/addons_updater/Dockerfile index c199d5e75..69f21529d 100644 --- a/addons_updater/Dockerfile +++ b/addons_updater/Dockerfile @@ -28,6 +28,18 @@ VOLUME [ "/data" ] # Add rootfs COPY rootfs/ / +# Modules +ARG MODULES="00-banner.sh" + +# Automatic modules download +RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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); fi && \ + mkdir -p /tmpscripts /etc/cont-init.d && \ + for scripts in $MODULES; do curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/$scripts" -o /tmpscripts/"$scripts"; done && \ + if [ -d /etc/cont-init.d ]; then /bin/cp -rf /tmpscripts/* /etc/cont-init.d/ && chmod -R 755 /etc/cont-init.d; fi && \ + if [ -d /scripts ]; then /bin/cp -rf /tmpscripts/* /scripts/ && chmod -R 755 /scripts; fi && \ + rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" > /MODULESFILE + # Manual apps ENV PACKAGES="" @@ -39,16 +51,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get /automatic_packages.sh "${PACKAGES:-}" && \ rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE -# Modules -ARG MODULES="00-banner.sh" - -# Automatic modules download -RUN mkdir -p /tmpscripts /etc/cont-init.d && \ - for scripts in $MODULES; do curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/$scripts" -o /tmpscripts/"$scripts"; done && \ - if [ -d /etc/cont-init.d ]; then /bin/cp -rf /tmpscripts/* /etc/cont-init.d/ && chmod -R 755 /etc/cont-init.d; fi && \ - if [ -d /scripts ]; then /bin/cp -rf /tmpscripts/* /scripts/ && chmod -R 755 /scripts; fi && \ - rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" > /MODULESFILE - ################ # 4 Entrypoint # ################