From 4896d71937474571e5945aed0977b053a5349f91 Mon Sep 17 00:00:00 2001 From: Adam Warner 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 --- .gitignore | 2 ++ src/Dockerfile | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index e8f6ff4..c450021 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 12fe8de..98307ac 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -70,6 +70,11 @@ 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 +# See: https://stackoverflow.com/a/46801962 +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"]