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,703 Commits 10 Branches 115 Tags 4.7 MiB
061251e599
Commit Graph

44 Commits

Author SHA1 Message Date
Adam Dawidowski
5dc25ed425 Enhance theme validation 
Makes the validation dynamic based on the existing theme css file names and
applies a regexp sanity check just to be sure.

Signed-off-by: Adam Dawidowski <drake@oomkill.net>
 2023-12-10 22:31:15 +01:00
SamTV12345
9db9fe0e07 Fixed spellcheck. 2023-10-08 13:56:18 +02:00
Adam Warner
c470b10c66
Merge pull request #1338 from pi-hole/add_new_web_themes 
Allow high contrast themes for WEBTHEME
 2023-05-28 12:34:21 +01:00
Adam Warner
78d2a08271
Merge pull request #1339 from casperklein/cronjob 
Recreate pi-hole cronjob on container start
 2023-05-28 12:34:06 +01:00
Christian König
28e9be0e4c
Adjust arch detection 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-05-11 23:09:12 +02:00
Christian König
69e55ac143
Tweak commands 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-05-11 22:07:53 +02:00
Sebastian Liebscher
5aa3abc282
Update install.sh 
Signed-off-by: Sebastian Liebscher <112352529+sebastianliebscher@users.noreply.github.com>
 2023-05-02 19:15:18 +02:00
Sebastian Liebscher
7a20e9fdb1
Update install.sh 
Signed-off-by: Sebastian Liebscher <112352529+sebastianliebscher@users.noreply.github.com>
 2023-04-30 06:31:18 +02:00
RD WebDesign
8ae9b56fd8
Allow 2 new options (high contrast themes) for WEBTHEME 
Fix #1337

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2023-03-23 13:12:34 -03:00
Casper
8a42555262
Recreate pihole cronjob on container start 
Signed-off-by: Casper <casperklein@users.noreply.github.com>
 2023-03-23 01:16:42 +01:00
Adam Warner
d021c172f6
Add vim-tiny to the dev/nightly image for those that prefer it over nano 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-02-16 00:09:47 +00:00
Adam Warner
4961bf4b1a
as mentioned in https://github.com/pi-hole/docker-pi-hole/issues/1323 
It is worth noting that this page will exist on a bare metal fresh installation, too. Should we delete it? Probably not - we shouldn't touch that directory really - but in docker we have more control as we build the image from fresh each time. TL;DR, we can do things here that we shouldn't in bare metal installs

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-02-15 23:53:43 +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
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
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
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
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
Adam Warner
1d59f257ff
Reorganise the repository 
Simplify the test suite now that we use buildx to build the final image
Remove tests that were never run/skipped in previous runs (same number of tests passing as were before)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-07-15 17:43:09 +01:00