a26eb9c6ad
Set FTL REPLY addresses instead of setupVars.conf.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2021-08-19 17:29:54 -07:00
56f4933237
Add an addional version injection case, for when core versions are not on alternative branches.
...
Move ENV VAR up higher in the Dockerfile so that `install.sh` actually sees it...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-08-06 01:27:45 +01:00
88518b036d
Inject the container tag into the web interface footer
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-08-05 20:21:35 +01:00
3865e77c6e
Introduce internal PIHOLE_TAG variable so that we can see what tag the container is...
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-08-05 00:59:34 +01:00
388f0f01a1
Disable some more `pihole` functions when run from within docker
...
Inject a message into the debug output that lets us know it's been run in a docker container
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-08-04 23:41:39 +01:00
bdaf352a23
Allow for passing in optional branch name to workflow_dispatch build
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-08-04 18:52:37 +01:00
55b257126b
bump web_version
2021-08-04 18:44:04 +01:00
1f1dc03a69
Merge pull request #888 from DistractionRectangle/Set-Phasers-to-Stun
...
Remove Unneccessary kill -9
2021-08-04 18:43:09 +01:00
2b2e05dce3
Merge pull request #890 from danifr/patch-1
...
Use nginxproxy's DockerHub registry
2021-08-04 18:42:18 +01:00
451fc19432
Merge branch 'dev' into patch-1
2021-08-04 18:41:56 +01:00
8d536703d9
Merge branch 'master' into patch-1
2021-08-04 18:41:37 +01:00
58e1eac241
Merge pull request #857 from orazioedoardo/fix-dns-bogus-priv
...
Fix DNS_BOGUS_PRIV description
2021-08-04 18:36:59 +01:00
91d75416b8
Merge branch 'dev' into fix-dns-bogus-priv
2021-08-04 18:36:18 +01:00
e65890208b
Merge pull request #869 from tlgs/master
...
Add documentation for WEBPASSWORD_FILE
2021-08-04 18:34:58 +01:00
559b317148
Merge branch 'dev' into master
2021-08-04 18:32:59 +01:00
92999dff08
Merge pull request #886 from gbrsni/dev
...
Small correction in the 'Quick Start' section of the README
2021-08-04 18:29:00 +01:00
1c6ba2d3c7
Merge pull request #882 from pi-hole/rem-debconf-set-selections
...
Remove no longer needed workaround for resolvconf
2021-08-04 18:27:55 +01:00
a45725ed37
Merge pull request #883 from DistractionRectangle/fix-gravitydb-check
...
Fix gravityDB check
2021-08-04 16:51:17 +01:00
e98dff970f
Merge branch 'dev' into rem-debconf-set-selections
2021-08-04 16:40:05 +01:00
e674bb4b81
Merge branch 'dev' into fix-gravitydb-check
2021-08-04 16:39:12 +01:00
6820b2e55c
Merge branch 'dev' into Set-Phasers-to-Stun
2021-08-04 16:39:06 +01:00
cec28c79f4
Merge pull request #892 from pi-hole/tweak/multiarch-image-rebuild
...
Switch `multiarch/debian-debootstrap` to `pihole/debian-debootstrap` to fix build issues
2021-08-04 16:37:15 +01:00
a44b7f1205
Use the rebuild images in the `pihole` namespace
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-08-04 15:50:12 +01:00
bf82c2e8f5
[skip ci] Merge new envvar layout from master into dev
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-08-04 11:36:55 +01:00
73f1cb3e74
Use nginxproxy's DockerHub registry
...
The official nginx-proxy repo is transitioned away from jwilder/nginx-proxy
ad7c02570b
2021-08-04 11:23:10 +02:00
8565c3828d
[skip ci] Break out defaults and values for clarity.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2021-08-03 13:43:44 -07:00
d0e6b77fdb
Break out defaults and values for clarity.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2021-08-03 12:06:09 -07:00
b5046af667
Update README.md
...
Now suggesting usage of the '-d' flag.
2021-07-28 07:56:31 +00:00
408f71a480
Remove Unneccessary kill -9
...
Since piholeFTL test properly spins down it's no longer
necessary to kill it. He's dead Jim
Merge #300 , added `piholeFTL test` to the startup sequence to
replace dnsmasq as a dependency for validate_env and gravity.sh.
kill -9 was kept as a work around to a standing issue that
`piholeFTL test` didn't spin down on it's own. This was fixed
in pi-hole/FTL#1067 , landed on Apr 14 2021 and confirmed
working, as evinced by #834 which was filed the same day it
that fix landed.
Signed-off-by: D.Rect <48034372+DistractionRectangle@users.noreply.github.com>
2021-07-25 08:25:35 -07:00
7650896158
Fix gravityDB check
...
piholeFTL exposes configuration to relocate/rename gravityDB so
we cannot just check a hard coded location. This commit greps
pihole-FTL.conf for a custom location. Since pihole-FTL.conf
will eventually be replaced by TOML, some verbosity is added to
denote what config file is being checked and what location it
ultimately ended up checking.
Signed-off-by: D.Rect <48034372+DistractionRectangle@users.noreply.github.com>
2021-07-24 15:20:38 -07:00
4dba6339c7
Remove no longer needed workaround for resolvconf
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-07-21 21:31:34 +01:00
ba9d2e54bf
Merge pull request #881 from pi-hole/fix-grav-firstrun
...
Ignore SKIPGRAVITYONBOOT if gravity.db does not exist
2021-07-21 21:03:16 +01:00
d13ae118b4
Merge pull request #879 from MichaIng/patch-2
...
Remove obsolete debconf-apt-progress workaround
2021-07-21 19:54:04 +01:00
7d82719839
Add note to README
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-07-21 19:45:28 +01:00
70c573b69e
Ignore SKIPGRAVITYONBOOT if not gravity.db exists, which will be the case if a fresh container is built with a new (empty) volume mapped to it.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-07-21 19:41:35 +01:00
bd121aa471
@MichaIng Remove obsolete debconf-apt-progress workaround
...
Since https://github.com/pi-hole/pi-hole/pull/2962 debconf-apt-progress is not used anymore in the basic-install.sh script, making the workaround obsolete.
Signed-off-by: MichaIng <micha@dietpi.com>
2021-07-21 20:16:46 +02:00
28b5154e52
Include information about nightly/beta tags
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-07-04 22:07:46 +01:00
918e6b1a21
convert `/` to `-` in FTL_VERSION so that image name is valid
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-07-04 21:46:45 +01:00
9292d8e58a
Merge branch 'master' into dev
2021-07-04 19:01:07 +01:00
76be304d79
remove #yolo from nightly build yml
...
add custom build task... (not holding my breath)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-07-04 18:52:13 +01:00
0c5ffd72f4
Merge pull request #873 from adyanth/dev
...
Update README.md to add changes in #867
2021-07-04 14:35:38 +01:00
3022fa5092
Update README.md to add changes in #867
...
Signed-off-by: Adyanth H <adyanthh@gmail.com>
2021-07-04 13:09:16 +00:00
2bc1e9c5cb
Merge pull request #867 from adyanth/dev
...
Adding CORS_HOSTS to PHP environment
2021-07-04 11:49:42 +01:00
f95bcba67a
docs: add WEBPASSWORD_FILE to README
...
Signed-off-by: Tiago Seabra <tlgs@users.noreply.github.com>
2021-06-17 16:03:36 +01:00
437e8ddbf5
Change tab to spaces
...
Signed-off-by: Adyanth H <33192449+adyanth@users.noreply.github.com>
2021-06-16 10:53:28 +05:30
901ee3d10b
Adding CORS_HOSTS to PHP environment
...
Signed-off-by: Adyanth H <33192449+adyanth@users.noreply.github.com>
2021-06-07 16:01:39 +05:30
5ed2b9ab2c
Merge pull request #861 from lightswitch05/feature/single-versions-file
...
Single versions file
2021-06-05 22:01:14 +01:00
6b1765c638
Single pihole version file. Added 'python-dotenv' to parse for the VERSIONS file.
...
Signed-off-by: Daniel <daniel@developerdan.com>
2021-06-04 19:37:28 +00:00
67b04365c5
Merge pull request #856 from AlexandreRatte/Issue_778
...
Introduced WEBTHEME environment variable to control user interface theme selection.
2021-06-03 12:03:14 +01:00
39fa779653
Fix DNS_BOGUS_PRIV description
...
Setting the DNS_BOGUS_PRIV variable to true blocks (not enables) reverse dns lookups for private ranges.
2021-05-20 15:00:34 +02:00
Dan Schaper
Adam Warner
Daniel Fernández
gbrsni
D.Rect
MichaIng
Adyanth H
Tiago Seabra
Adyanth H
Daniel
Orazio