From 18b3a70ce5ee8d0e1e9f72523e70998612378d95 Mon Sep 17 00:00:00 2001 From: Adam Warner <me@adamwarner.co.uk> Date: Sun, 22 Oct 2023 18:17:57 +0100 Subject: [PATCH] Allow overwriting of downloaded FTL binary at build time _if_ it exists in the /src directory Signed-off-by: Adam Warner <me@adamwarner.co.uk> --- .gitignore | 2 ++ src/Dockerfile | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index e8f6ff459..c45002135 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ var-log/ # WIP/test stuff doco.yml + +src/pihole-FTL diff --git a/src/Dockerfile b/src/Dockerfile index 12fe8de26..e4bc9a2e6 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -70,6 +70,10 @@ RUN cd /etc/.pihole && \ COPY --chmod=0755 bash_functions.sh /usr/bin/bash_functions.sh COPY --chmod=0755 start.sh /usr/bin/start.sh +# Overwrite pihole-FTL binary from src directory if it exists +# Useful for testing local builds of pihole-FTL prior to the CI build completing +COPY --chmod=0755 pihole-FT[L] /usr/bin/pihole-FTL + HEALTHCHECK CMD dig +short +norecurse +retry=0 @127.0.0.1 pi.hole || exit 1 ENTRYPOINT ["/sbin/tini", "--", "start.sh"]