docker/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2024-06-30 21:20:59 +02:00
Code Issues Releases Wiki Activity
1,596 Commits 10 Branches 115 Tags 4.8 MiB
c89d5d1286
Commit Graph

67 Commits

Author SHA1 Message Date
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
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