From 83663d8bdb8720d7db82f1f5225a3633495f1570 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 13 Jan 2022 22:21:55 +0100 Subject: [PATCH] Update Dockerfile --- cloudcommander/Dockerfile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/cloudcommander/Dockerfile b/cloudcommander/Dockerfile index 4f23e4b7c..3fb5976a8 100644 --- a/cloudcommander/Dockerfile +++ b/cloudcommander/Dockerfile @@ -27,6 +27,18 @@ FROM coderaiser/cloudcmd:latest # Add rootfs COPY rootfs/ / +# Modules +ARG MODULES="00-banner.sh 92-local_mounts.sh 92-smb_mounts.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="jq \ cifs-utils \ @@ -41,18 +53,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 92-local_mounts.sh 92-smb_mounts.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 - ################ # 4 Entrypoint # ################