Adam Hill
d7fdb188ed
remove resolv conf checks
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-05-26 10:45:48 -05:00
Adam Hill
d444a11ad1
Merge branch 'dev' of github.com:pi-hole/docker-pi-hole into beta-v5.0
2020-05-10 11:58:22 -05:00
Adam Hill
3c510e2edb
remove HTML web port sed/test, no hits exist anymore
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-04-18 15:18:15 -05:00
Daniel
64892423b6
Added 'WEBPASSWORD_FILE' environment variable to enable support for Docker Secrets.
...
If 'WEBPASSWORD' is set, 'WEBPASSWORD_FILE' is ignored. If 'WEBPASSWORD' is empty, and 'WEBPASSWORD_FILE' is set to a valid readable file, then 'WEBPASSWORD' will be set to the contents of 'WEBPASSWORD_FILE'.
Signed-off-by: Daniel <daniel@developerdan.com>
2020-02-26 13:13:20 -05:00
Adam Hill
3765d41b5c
Update way too much
...
- Tox py3.7 + pipenv
- Python3 Dockerfile.py
- Dockerfile.py tags remote instead of just local image names now
- Circle.sh instead of in-line circle.yml script breakout
- probably other stuff I forgot
- Docker images build during the tests should hopefullly now be available at the deploy job workflow thanks to shared docker layers.
- Rename aarch64 to arm64 to reduce custom map
2020-01-30 20:26:57 -06:00
Adam Hill
fd48454649
Revert "initial commit on configdir as volume"
...
This reverts commit c1fb17a645
.
Signed-off-by: Adam Hill <adam@diginc.us>
2019-06-01 12:16:14 -05:00
Martin Buchleitner
f950671a1c
missed test update
...
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
2019-05-08 08:31:42 +02:00
Martin Buchleitner
c1fb17a645
initial commit on configdir as volume
...
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
2019-05-08 08:12:58 +02:00
Adam Hill
5dfa5398b8
Fix #364
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-17 00:18:34 -06:00
Adam Hill
ca4fe84df2
add some more details to ouput to debut travis failure
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-13 23:26:21 -06:00
Adam Hill
f71ecf0802
Fix default block list install
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-09 00:22:12 -06:00
Adam Hill
7ecf7c6f28
Fixed tests!
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-08 23:14:48 -06:00
Adam Hill
fca7769b33
remove ServerIP requirement, simpler example commands
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-07 19:51:15 -06:00
Mathieu Hofman
6629aff889
Allow running pihole-FTL as non-root
...
- Add a new container environment variable allowing to specify the user to run the pihole-FTL process as. Defaults to root.
- Set inherited capabilities attributes on the pihole-FTL file to automatically grant runtime permitted capabilities when available in the bounding set. This allows dropping root before starting pihole-FTL without failing with a permission error if the capabilities are not available to the container (the process may still error out if performing an operation requiring the capability).
- Add some information on capabilities to the Readme file.
Signed-off-by: Mathieu Hofman <86499+mhofman@users.noreply.github.com>
2019-02-06 02:31:33 -08:00
Adam Hill
68d6c343a5
hotfix for bad grep
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-05 00:17:59 -06:00
Adam Hill
1e2cdba3a3
change to calling it dnsmasq user
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-03 18:37:03 -06:00
Adam Hill
0b8333f7bc
v4.2.1 & more robust user root fix
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-03 18:30:51 -06:00
Adam Hill
cf1bb48fa8
run FTL as root
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-03 12:47:41 -06:00
Adam Hill
d3309ebb1a
remove old blocking page setup/test
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-21 22:43:38 -06:00
Adam Hill
f3cf5dc858
Adding test and check for resolv.conf
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-10 00:28:39 -06:00
Adam Hill
19fee6fa5e
README update for 4.1.1 and test improvement
...
* split out arg fixture to improve grainularity of test overriding
* README points out new arguments that improve likelihood of success
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-08 21:01:42 -06:00
Adam Hill
3870154ae3
Merge pull request #334 from dhutchison/development
...
Implemented missing support for DNSMASQ_LISTENING environment variable
2018-10-27 12:01:04 -05:00
Adam Hill
c290324185
Change password logic completely to avoid any extra debug prints
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-10-16 19:57:25 -05:00
Adam Hill
f1b34887f8
The debug printing logic was inverted here. Left on without debug enabled, turned off when debug was enabled
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-10-16 19:14:02 -05:00
David Hutchison
7515c10a69
Implemented missing support for DNSMASQ_LISTENING environment variable
...
Signed-off-by: David Hutchison <dhutchison86+github@googlemail.com>
2018-09-29 22:20:33 +01:00
Adam Hill
63f2c4ea00
Fixing error with random passwords, null checking moved earlier
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-09-18 00:11:26 -05:00
Adam Hill
d1c0ed9bf3
Dnsmasq config test
...
Exit during container startup if dnsmasq configs have any issues
2018-08-07 15:53:38 -05:00
Adam Hill
41b1d04100
Do not delete the setting before sourcing the file :}
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-06 07:46:29 -05:00
Adam Hill
f8d37693ed
Fix regex writing for web, fix deploying latest
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-05 22:23:22 -05:00
Adam Hill
65a1ac7f1e
grab version on startup for web footer. 2 tests stablized
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-05 18:20:55 -05:00
Adam Hill
20e8ce208c
quick fix to web password regression, probably not greatest fix but it works
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 16:19:11 -05:00
Adam Hill
119999be71
Fix web password corruption
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 15:58:05 -05:00
Adam Hill
80d5b9dbc1
Test image name updates, passing locally. reorg Dockerfile to build fast, starting on new deploy
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 13:31:58 -05:00
Adam Hill
e7ae12a94c
Add fixes for config permissions, deprection notice
2018-08-02 22:50:01 -05:00
Adam Hill
468470b7b5
Added setup_blocklists, other cleanup
...
* Removed some old switch statements from alpine no longer required
* Limit parallel tests to 2 to help prevent test failure caused by race condition starting parallel tests/containers
* Began introducing a new ENV NO_SETUP to skip the majority of startup script 'setup' functions eventually
Signed-off-by: Adam Hill <adam@diginc.us>
2018-07-29 18:17:54 -05:00
diginc
70acf54c2c
Merge branch 'dev' of github.com:diginc/docker-pi-hole into prerelease
2018-07-10 23:16:40 -05:00
Adam Hill
3afc1d43ff
Merge pull request #290 from StefanSchoof/SingleDns
...
allow no for DNS2
2018-07-10 23:14:19 -05:00
StefanSchoof
3171feef4c
allow no for DNS2
2018-07-06 08:01:41 +00:00
diginc
3877a171da
fix startup 53 port conflict and test error
2018-07-04 14:11:18 -05:00
diginc
ad6b4be403
Fixes to the startup, services, and dnsmasq references
2018-07-03 00:19:01 -05:00
Andrew Lefchak
af1816b7e5
Fixed malformed lighthttpd.conf when using host networking and setting WEB_PORT. Fixes #247
2018-06-23 00:04:08 -04:00
diginc
53f766876e
Adding fix for #229
...
* Updates references in /var/www/html to also use WEB_PORT custom HTTP port
* Also a deploy script I use for uploading ARM/Multiarch so I stop pulling it out of bash history
2018-02-22 23:11:53 -06:00
diginc
a9b41c7099
make the valid IP checks consistent between IPv4 and IPv6
2018-01-26 21:32:39 -06:00
Adam Hill
91481efe48
Merge branch 'dev' into Installer_patches
2018-01-26 19:01:07 -06:00
diginc
c9165850c3
move init to a different name to fix s6-overlay issue #158
2018-01-26 19:00:06 -06:00
diginc
9b7e3998d6
Fix ServerIP v4 validation - error can also be about DNS not being up yet
2018-01-26 18:26:46 -06:00
diginc
62ddf72d15
exit on config fest failure
2018-01-25 12:45:05 -06:00
DerFetzer
9427357489
Make Lighttpd also bind to localhost when using host network
2018-01-13 15:31:03 +00:00
diginc
3bcdd27cb9
fix ipv6 test
2018-01-04 22:30:40 -06:00
diginc
c4dc16685a
shrink 20-start.sh, merge to start.sh
2018-01-03 22:34:31 -06:00