docker/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2024-06-26 00:59:07 +02:00
Code Issues Releases Wiki Activity
1,577 Commits 10 Branches 115 Tags 4.7 MiB
4ec50469c7
Commit Graph

52 Commits

Author SHA1 Message Date
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
Adam Warner
7efb80f988
Allow for empty strings to be passed into FTLCONF_ environment variables. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-01-20 18:22:32 +00:00
Adam Warner
cbf5d6620c
lighttpd does not like it if VIRTUAL_HOST and FTLCONF_LOCAL_IPV4 are the same value - but that makes sense. Instead we set VIRTUAL_HOST to HOSTNAME if it is not already set by the user 
Also goes back to making the modifications to 15-pihole-admin.conf in conf-available - as otherwise it overwrites the symlink. Not a big deal, but I think we got confused earlier on

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-01-18 22:41:54 +00:00
Adam Warner
d588dba28e
Modify the 15-pihole-admin.conf file in the correct path. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-01-18 17:47:40 +00:00
Adam Warner
61bd3c756a
I don't know why PHP_ENV_CONFIG is an environment variable. We don't need it to be 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-01-18 15:26:29 +00:00
Adam Warner
4c240a43d2
Introduce an additional lighttpd config file to redirect the IP address and VIRTUAL_HOST to /admin/ 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-01-15 23:48:34 +00:00
RD WebDesign
a58b1c08bd Change PHP_ENV_CONFIG and setup_web_php_env() 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2023-01-15 17:12:05 -03:00
Adam Warner
f20a0d448c
Add to /usr/local/bin and drop the .sh. Can now be called with padd 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-12-11 16:16:29 +00:00
Adam Warner
fbef9727c1
Update Dockerfile 
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
 2022-12-11 15:47:26 +00:00
Adam Warner
201303a56a
ADD padd.sh to the container root 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-12-11 15:47:26 +00:00
Adam Warner
a0421789cc
CAP_STR will always be empty, since 776bac7b moved the calculation of that variable back out to bash_functions.sh 
The capabilities are already set there, so they do not need to be set again here.

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-11-27 22:35:31 +00:00
Adam Warner
f73c92d03b
rename _gravityonboot service/script to _postFTL and move updatecheck/version output to this script 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-11-09 17:51:07 +00:00
Adam Warner
658f6de774
FTL.port file is deprecated (see https://github.com/pi-hole/FTL/pull/1445) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-09-24 15:11:27 +01:00
danitorregrosa
913f11beb5
S6_ARCH fix for rpi1 
Resolves #1201

Signed-off-by: danitorregrosa <danitorregrosa@gmail.com>
 2022-09-22 22:55:21 +02:00
Adam Warner
f94fb54a18
Some of these should not be user overridable 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-09-19 21:46:46 +01:00
LaboDJ
540ca1e31f Remove the email function 
It was removed from pi-hole in 5.12 by this PR https://github.com/pi-hole/pi-hole/pull/4870

Signed-off-by: LaboDJ <2527836+labodj@users.noreply.github.com>
 2022-09-03 05:31:11 +02:00
Adam Warner
0d5a001916
also run remote update check on container startup 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-09-02 21:37:10 +01:00
Adam Warner
0bbdd15073
Set FTL/DNSMASQ listening behaviour per variable if it is passed. Fixes #1188 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-08-29 17:12:58 +01:00
Adam Warner
efd587bdd1
Read CAP_STR into an array and output one cap per line in startup 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-08-29 16:49:16 +01:00
Adam Warner
27980ed9cf
Prevent S6 timeouts on container start by setting S6_CMD_WAIT_FOR_SERVICES_MAXTIME to 0, per https://github.com/just-containers/s6-overlay/issues/452 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-08-29 16:33:41 +01:00
Adam Warner
14c67ed729
capabilites ==> capabilities 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-08-29 13:22:50 +01:00
Adam Warner
97f81bae21
Shuffle some files around, change dependencies to make output clearer, change ::: for [i] to further clarify output. 
Allow for  PH_VERBOSE to set -x on all scripts that it would be useful for

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-08-29 13:17:22 +01:00
Adam Warner
2b60df6d2b
Move uid/gid changer from legacy to new style. 
Move deprecated dependencies file to dependencies.d for all services. Make cron depend on base

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-08-29 12:20:10 +01:00
Adam Warner
473117e8a8
Rename start and gravity scripts to match their service names 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-08-29 11:50:19 +01:00
Adam Warner
e6d4c3091f
Move all scripts to /usr/local/bin to simplify dockerfile 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-08-29 11:48:07 +01:00
Adam Warner
55f4f89a0c
remove some no-longer-referenced files 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-08-29 11:37:42 +01:00
Adam Warner
faffe6430f
Remove the 01-resolver-resolv file - can't track down what it does from looking at commit history - functionality is deprecated 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-08-29 11:21:29 +01:00
Adam Warner
48c6192617
reintroduce ability to set verbose output 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-08-29 10:38:04 +01:00
Adam Warner
939a69b895
Test for empty values in the PIHOLE_DNS_ array, skip if it's empty 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-08-26 22:46:10 +01:00
Adam Warner
8619de0031
Revert change that removed the moving of /init to /s6-init. Add comments to make sure it does not get removed again 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-08-25 19:31:21 +01:00
Adam Warner
776bac7b90
[Experimental] Move the capability setting back to bash_functions from the pihole-FTL service 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-08-24 21:27:38 +01:00
Adam Warner
cb38190b50
FTLCONF_REPLY_ADDR4/6 are now deprecated. Use FTLCONF_LOCAL_IPV4/6 instead 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-08-22 21:42:29 +01:00
Adam Warner
6830b99e4a
Start gravityonboot.sh as a background task to prevent timeouts 2022-07-21 19:46:02 +01:00
Adam Warner
b9df80b1ee
Change of naming convention for oneshots 2022-07-21 19:45:30 +01:00