diff --git a/src/Dockerfile b/src/Dockerfile index 6465a45fc..a806db16f 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -3,9 +3,8 @@ FROM alpine:${CONTAINER} # https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope ARG TARGETPLATFORM -# download a repo from github -# TODO - probably remove a lot of these -RUN apk add --no-cache git \ +RUN apk add --no-cache \ + git \ bash \ curl \ bind-tools \ @@ -14,21 +13,11 @@ RUN apk add --no-cache git \ sudo \ unzip \ wget \ - libidn \ - nettle \ libcap \ - openresolv \ iproute2-ss \ jq \ coreutils \ - dialog \ - newt \ - procps \ - dhcpcd \ - openrc \ - ncurses \ - nano \ - less + procps # download a the main repos from github RUN git clone --branch development-v6 https://github.com/pi-hole/AdminLTE.git /var/www/html/admin && \ diff --git a/src/start.sh b/src/start.sh index 3eee79b14..5fe17c8f9 100644 --- a/src/start.sh +++ b/src/start.sh @@ -60,6 +60,11 @@ if [ "${PH_VERBOSE:-0}" -gt 0 ] ; then set -x ; fi +# Install editors inside container if requested +if [ "${INSTALL_DEV_TOOLS:-0}" -gt 0 ] ; then + apk add --no-cache nano less +fi + # Remove possible leftovers from previous pihole-FTL processes rm -f /dev/shm/FTL-* 2> /dev/null rm -f /run/pihole/FTL.sock