From 81e76714414509474f1664d5e3bef8f224ce6cf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig@posteo.de>
Date: Wed, 2 Aug 2023 22:20:20 +0200
Subject: [PATCH] Revert alias and make branch configurable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Christian König <ckoenig@posteo.de>
---
 src/Dockerfile | 3 ++-
 src/start.sh   | 3 ---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Dockerfile b/src/Dockerfile
index 12b1732..0710c74 100644
--- a/src/Dockerfile
+++ b/src/Dockerfile
@@ -7,6 +7,7 @@ ARG WEB_BRANCH="development-v6"
 ARG CORE_BRANCH="development-v6"
 ARG FTL_BRANCH="development-v6"
 ARG PIHOLE_DOCKER_TAG="unknown"
+ARG PADD_BRANCH="PADD_FTLv6"
 
 ENV DNSMASQ_USER=pihole
 ENV FTL_CMD=no-daemon
@@ -35,7 +36,7 @@ ADD https://ftl.pi-hole.net/macvendor.db /macvendor.db
 COPY crontab.txt /crontab.txt
 
 # Add PADD to the container, too.
-ADD --chmod=0755 https://raw.githubusercontent.com/pi-hole/PADD/PADD_FTLv6/padd.sh /usr/local/bin/padd
+ADD --chmod=0755 https://raw.githubusercontent.com/pi-hole/PADD/${PADD_BRANCH}/padd.sh /usr/local/bin/padd
 
 # download a the main repos from github
 RUN git clone --depth 1 --single-branch --branch ${WEB_BRANCH} https://github.com/pi-hole/AdminLTE.git /var/www/html/admin && \
diff --git a/src/start.sh b/src/start.sh
index 0766783..aeb924c 100644
--- a/src/start.sh
+++ b/src/start.sh
@@ -87,9 +87,6 @@ if [ "${INSTALL_DEV_TOOLS:-0}" -gt 0 ] ; then
     apk add --no-cache nano less
 fi
 
-# Add an alias for padd to the root user's bashrc
-port="${FTLCONF_webserver_port%%,*}"
-echo "alias padd='padd --port ${port:-8080} --secret ${FTLCONF_webserver_api_password}'" > /root/.bashrc
 
 # Remove possible leftovers from previous pihole-FTL processes
 rm -f /dev/shm/FTL-* 2> /dev/null