From db834f38dc8bbb108a9f68a4839c3808686e93f7 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 13 Jan 2022 22:18:45 +0100 Subject: [PATCH] Update Dockerfile --- arpspoof/Dockerfile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/arpspoof/Dockerfile b/arpspoof/Dockerfile index 855976df2..0eea6e00c 100644 --- a/arpspoof/Dockerfile +++ b/arpspoof/Dockerfile @@ -28,17 +28,6 @@ FROM techblog/arpspoof-docker:latest # Add rootfs COPY rootfs/ / -# Manual apps -ENV PACKAGES="jq curl iproute2" - -# 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 00-global_var.sh" @@ -51,6 +40,17 @@ 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="jq curl iproute2" + +# 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 # ################