docker
/
docker-pi-hole
mirror of https://github.com/pi-hole/docker-pi-hole.git
1
0
Fork 0
Code Issues Releases Wiki Activity
830 Commits 9 Branches 114 Tags 4.5 MiB
Commit Graph

48 Commits

Author SHA1 Message Date
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
Dan Schaper 36c1e66dc1
Convert regex string to raw. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2020-04-18 12:48:51 -07:00
Adam Warner ca9bf8ce5c
This should fix the tests 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-02-25 22:50:38 +00:00
Adam Hill 4c4e9c3bc9 Beta v5.0 
Signed-off-by: Adam Hill <adam@diginc.us>
 2020-02-03 23:39:03 -06: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
cclauss 6987b36981 Use print() function in both Python 2 and Python 3 
Legacy __print__ statements are syntax errors in Python 3 but __print()__ function works as expected in both Python 2 and Python 3.
 2019-08-31 22:07:13 +02:00
Adam Hill 89717949c4
Revert "missed test update" 
This reverts commit 20b130a666.
 2019-06-01 12:18:10 -05:00
Martin Buchleitner 20b130a666 missed test update 
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill 8ce0aafcd3 Fix #364 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill bbb770b6c0 disable this trash test 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill fea14ae5a4 sync 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill 7da8fa586b does this work any better 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill a4c4de3cf4 maybe 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill fded8bdcc4 show me your secrets 
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill 49d17bded0 back to using 2 dns 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill fea57446a5 revert to old setup 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill 41fc498166 Slow down after setup to try to fix test 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill 3e76bbd51f add some more details to ouput to debut travis failure 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill 062f94d0f7 Another flaky test, logs of readme 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill 1322db7ec3 Slow down all the flakey tests to pass 100% 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill 07bc55786b Fixed tests! 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02: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 b3beb91b52
update deploy version to 4.1 and fix broken server test 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-12-13 18:33:38 -06:00
Adam Hill d7a125a706
Version 4.1 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-12-12 20:43:08 -06:00
Adam Hill a47f278df0
cleanup uncessary build dep stuff 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-10-30 21:13:34 -05: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 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 520669a6b9
merge in dev/master armel goodies 2018-07-19 22:18:34 -05:00
diginc 70acf54c2c Merge branch 'dev' of github.com:diginc/docker-pi-hole into prerelease 2018-07-10 23:16:40 -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 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 615af98eab delete all the alpine 2018-01-03 20:09:47 -06:00
diginc eb7b0a1fd7 add firstboot marker allow setup of servers if they are passed in but never again 2017-11-19 23:15:44 -06:00
diginc 50fee7d832 Adding custom web port with tests 2017-11-14 22:33:05 -06:00
diginc d98837c828 expand most tests to run for all os arch combos 2017-10-05 11:59:19 -05:00
diginc 18997fe9f6 templated dockerfiles building used by tests 
* test images are built without diginc/ namespace
* no tests for other archs yet, unsure if they'll even build on travis
* Removed old dockerfiles
* New files names require Docker Cloud reconfiguration when merged upstream
* Probably some stuff I missed, just ask me
 2017-10-02 22:52:02 -05:00
diginc 0e2b77577d adding a alpine compatible list.sh 2017-05-13 18:43:34 -05:00
diginc b9095bc123 This commit is too big, but it works 
* Tests are passing, hopefully consistently
* FTL pulling from official releases
  * thanks @DL6ER for the musl-libc build
* Thanks middleagedman for the IPv6 fixes
* Thanks everyone for patience while I get this release working!
 2017-05-13 17:03:24 -05:00
diginc 67346c2f75 fix up PIHOLE_INTERFACE default 2017-03-04 17:31:09 -06:00
diginc 907d36ae9b Add web password support 2017-02-08 22:46:46 -06:00
diginc 5404d6124f re-do a few things to fix up test/handle updated code 2017-01-17 22:49:42 -06:00
diginc 6ec264e3b6 rename/clarify test and move RunningPiHole to global py.test scope 2016-11-06 13:40:24 -06:00
diginc 097f280c9b red test 2016-11-01 22:32:36 -05:00
diginc eddba93537 split out the bash function tests to own file 2016-10-31 23:42:08 -05:00