docker/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2024-06-25 08:47:48 +02:00
Code Issues Releases Wiki Activity
1,639 Commits 10 Branches 115 Tags 4.7 MiB
e0678bd803
Commit Graph

85 Commits

Author SHA1 Message Date
Adam Warner
62dd8d503c
Allow the for changing of the UID/GID of the user/group pihole 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-26 08:25:08 +01:00
Adam Warner
93826e2d1d
Add tzdata package so that users can define their own timezone at runtime 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-24 00:12:46 +01:00
edgd1er
45bbb490d0
Update src/Dockerfile 
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: edgd1er <edgd1er@hotmail.com>
 2023-07-24 00:43:21 +02:00
edgd1er
926b3ae8c6
fix arm64 arch. use copy --chmod 2023-07-24 00:39:02 +02:00
Adam Warner
e352c6b2ac
re-add the PIHOLE_DOCKER_TAG build arg that went missing along the way 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-23 18:45:06 +01:00
Adam Warner
3b5cf34036
Merge pull request #1384 from pi-hole/v6/branch-args 
Allow branch names to be passed in as build args
 2023-07-21 19:05:42 +01:00
Adam Warner
8cc91c5ae5
Add ncurses back in for the time being to fix pihole -v output. It was removed in #1366. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-20 19:20:32 +01:00
Adam Warner
bf414721e0
Allow branch names to be passed through as ARGs default development-v6 (for now) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-20 18:26:13 +01:00
Gontier Julien
e4b5da2f6d Reduce git clone size by only cloning what is needed 
Signed-off-by: Gontier Julien <gontierjulien68@gmail.com>
 2023-07-19 20:44:52 +02:00
Adam Warner
348e27b45f
Merge pull request #1368 from pi-hole/reimplement-skip-gravity 
Re-implement SKIPGRAVITYONBOOT
 2023-07-17 17:37:23 +01:00
Adam Warner
d5b639daee
Merge pull request #1366 from pi-hole/tweak/remove_deps 
Remove some unnessacery dependencies
 2023-07-17 17:36:52 +01:00
Adam Warner
a3a199cb47
Merge pull request #1382 from Gontier-Julien/ADD-to-COPY 
Change so ADD to COPY following docker best practices
 2023-07-16 19:07:02 +01:00
Snow
030e375386
add a space between && and \ for readability 
Make it consistence with other multi-line commands.

Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: Snow <52894530+Gontier-Julien@users.noreply.github.com>
 2023-07-16 12:14:56 +02:00
Gontier Julien
1a1e4cecb7 Change so ADD to COPY following best practices 
Signed-off-by: Gontier Julien <gontierjulien68@gmail.com>
 2023-07-15 23:29:58 +02:00
Gontier Julien
f15640505c Remove one layer by having both git clone together 
Signed-off-by: Gontier Julien <gontierjulien68@gmail.com>
 2023-07-15 23:13:11 +02:00
Adam Warner
11b6b8bd34
Remove some dependencies, move nano & less to the start script and only intall if env var INSTALL_DEV_TOOLS > 0 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-11 19:15:52 +01:00
Adam Warner
5d33fdadd3
reimplement allowing user to skip gravity on boot with the environment variable SKIPGRAVITYONBOOT (as with v5) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-11 19:15:37 +01:00
Adam Warner
5435c9d6c1
Start FTL after running gravity completely. Else we end up in a situation where the database getss stuck in readonly 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-09 17:09:32 +01:00
Adam Warner
c89d5d1286
Minor formatting tweaks 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-09 17:02:38 +01:00
Adam Warner
d415bffcb7
Create our own cron file rather than copying the one from the core repo (which contains non-standard cron syntax) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-03 22:54:49 +01:00
Adam Warner
cc3789df21
Attempt to reduce code reuse in action 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-03 22:01:44 +01:00
Adam Warner
0f15d7b3ac
Remove duplicate APKs 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-03 19:15:27 +01:00
Adam Warner
194fe3121f
Add nano and less to the image 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-03 19:06:55 +01:00
Adam Warner
1a09d39444
chown the macvendor that we copied to root 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-06-29 17:25:08 +01:00
Adam Warner
a5c8e6d873
Run pihole update checked on container start 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-06-29 17:24:56 +01:00
Adam Warner
45c636eb25
Use pihole-FTL prestart script from core repo to avoid code duplication. Change the order of startup objects a little. 
look at starting crond on startup

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-06-21 19:18:12 +01:00
Adam Warner
2e5998175b
Yolo 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-06-19 22:44:22 +01:00
Adam Warner
452e0ca072
Add some arch detection into the dockerfile. 
This seems to build locally, lets see what GHA does with it

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-06-19 21:39:24 +01:00
RD WebDesign
7c48cd548f
Fix typo wi1th to with 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2023-06-18 19:10:46 -03:00
RD WebDesign
c21a85ed58
Use the new development-v6 branches for all repos 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2023-06-18 19:09:34 -03:00
Adam Warner
171c8108f9
Remove the s6 directory to prevent confusion. I will try to remember where I was with the previous commit. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-06-09 18:53:42 +01:00
Adam Warner
d7a25836ad
checkpoint 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-02-15 23:48:53 +00:00
Adam Warner
382367f968
Get config options from pihole-FTL directly 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-02-11 13:59:28 +00:00
Adam Warner
4ec50469c7
!!!BREAKING!!! Use this as an oppurtunity to tidy up/uniform the environment variables. Most things can be set directly in pihole.toml these days, so will convert variables in the format of FTLCONF_key or FTLCONF_key_subkey etc into key or key.subkey respectively and apply them to the config 
This also takes away a lot of the error handling - but that should likely be in FTL if anywhere, anyway. Vastly simplifies startup in docker

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-02-10 23:01:19 +00:00
Adam Warner
7d93b94a53
Allow setting custom WEB_PORT to 80 (todo: Look at a new catchall for FTL config settings) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-02-10 23:00:54 +00:00
Adam Warner
d0790440cd
What setupVars? 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-02-10 23:00:54 +00:00
Adam Warner
87c0103c56
set ownership of pihole.toml in start up 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-02-10 23:00:54 +00:00
Adam Warner
a6a7914a2b
update macvendor setting 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-02-10 23:00:54 +00:00
Adam Warner
626237a92d
Switch to devel-v6 branch on the web interface 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-02-10 23:00:54 +00:00
Adam Warner
09ccd44c54
Remove some lighttpd related functions 
Setting web password now works
Setting DHCP should work?
Setting conditional forwarders should work

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-02-10 23:00:54 +00:00
Adam Warner
99ccda1e7f
use PADD from the PADD_FTLv6 branch 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-02-10 23:00:54 +00:00
Adam Warner
a27bd400c2
Oh yeah, we don't need these lighttpd files any more... 2023-02-10 23:00:54 +00:00
Adam Warner
45f2d2dad6
switch out the base image for debian with for now - fewer packages pre-installed than the pihole base image 2023-02-10 23:00:54 +00:00
Adam Warner
18609ec80e
VERY rough starting point for a v6 container. 
Lots of stuff removed/commented out just to make the container start - things will need revisiting once we are settled on how we will configure FTL from the CLI

Tests will fail for sure. Can't seem to make it work without host-mounting /etc/pihole at the moment

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-02-10 23:00:54 +00:00
Adam Warner
d7ff34fd74
Instead of including a static config file for redirecting it - dynamically create this file on container start. 
This gets rid of what was probably a hack to have the VIRTUAL_HOST declared as an empty string in the Dockerfile (lighttpd would not start if env.VIRTUAL_HOST was not set

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-01-23 23:20:30 +00:00
Adam Warner
846805aeb7
Configure FTL to use /macvendor.db instead of /etc/pihole/macvendor.db. If user is passing in their own location, then we honour that. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-01-23 17:52:39 +00:00
Adam Warner
a1f5c6b530
Revert "Ensure that the directory /run/lighttpd exists, and that it is owned by www-data" 2023-01-23 17:22:54 +00:00
Adam Warner
90df84553a
Ensure that the directory /run/lighttpd exists, and that it is owned by www-data. How did this work before?! 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-01-22 17:51:09 +00:00
Nathan Gaberel
d2637c3a02
Rewrite WEB_PORT log. 
Signed-off-by: Nathan Gaberel <nathan@gnab.fr>
 2023-01-21 18:06:14 -08:00
Nathan Gaberel
54d179c24b
Bind lighttpd to $WEB_BIND_ADDR by default. 
Signed-off-by: Nathan Gaberel <nathan@gnab.fr>
 2023-01-21 18:06:05 -08:00