Allow overwriting of downloaded FTL binary at build time _if_ it exis…

…ts in the /src directory Signed-off-by: Adam Warner <[email protected]>
pi-hole · Oct 22, 2023 · 18b3a70 · 18b3a70
1 parent 77ee293
commit 18b3a70
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git 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
@@ -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"]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,3 +16,5 @@ var-log/

		# WIP/test stuff
		doco.yml

		src/pihole-FTL