From 2fe9b7e6f0fae51813f39e0f0277bebabc2195f9 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 13 Jan 2022 22:26:03 +0100 Subject: [PATCH] Update Dockerfile --- filebrowser/Dockerfile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/filebrowser/Dockerfile b/filebrowser/Dockerfile index 0ad6441f8..28fcfeaf1 100644 --- a/filebrowser/Dockerfile +++ b/filebrowser/Dockerfile @@ -29,18 +29,6 @@ FROM hurlenko/filebrowser:v${BUILD_UPSTREAM} # Add rootfs COPY rootfs/ / -# Manual apps -ENV PACKAGES="bind-tools \ - nginx" - -# Automatic apps & bashio -RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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 && \ - curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && \ - chmod 777 /automatic_packages.sh && \ - /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" @@ -53,6 +41,18 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get     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="bind-tools \ + nginx" + +# Automatic apps & bashio +RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); 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 && \ + curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && \ + chmod 777 /automatic_packages.sh && \ + /automatic_packages.sh "${PACKAGES:-}" && \ + rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE + ################ # 4 Entrypoint # ################