1
0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2024-06-28 12:11:04 +02:00
Commit Graph

127 Commits

Author SHA1 Message Date
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
09131ad78f Merge branch 'master' into k8s
* master:
  Official tag time
  Docker Pi-hole v4.3
2019-05-28 09:15:08 +02:00
Martin Buchleitner
7c402d329a updated 2019-05-28 09:14:21 +02: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
7cb09b78db empty the adlist for 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
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
397ec03285 remove ServerIP requirement, simpler example commands
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
2019-05-09 16:50:18 +02:00
Martin Buchleitner
f950671a1c missed test update
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
2019-05-08 08:31:42 +02:00
Adam Hill
02e3ead7eb
Docker Pi-hole v4.3
Signed-off-by: Adam Hill <adam@diginc.us>
2019-04-11 22:17:26 -05:00
Adam Hill
5dfa5398b8
Fix #364
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-17 00:18:34 -06:00
Adam Hill
ceda92b0f2
disable this trash test
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-14 21:01:36 -06:00
Adam Hill
0563a3c795
sync
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-14 20:05:53 -06:00
Adam Hill
5f36094b21
does this work any better
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-14 19:55:18 -06:00
Adam Hill
f0e2d705dc
maybe
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-14 00:48:03 -06:00
Adam Hill
ca3fcd6993
show me your secrets 2019-02-14 00:42:05 -06:00
Adam Hill
2040cc5978
back to using 2 dns
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-14 00:23:42 -06:00
Adam Hill
1ccea93c16
revert to old setup
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-14 00:18:55 -06:00
Adam Hill
9c7b02aba9
Slow down after setup to try to fix test
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-13 23:45:17 -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
f9a21d2ff9
empty the adlist for tests
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-12 22:16:15 -06:00
Adam Hill
1685ed342f
Another flaky test, logs of readme
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-09 02:08:20 -06:00
Adam Hill
236b2f1ed6
Slow down all the flakey tests to pass 100%
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-09 00:09:37 -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
Adam Hill
d6642fc191
broken test (works outside tests), not required for release
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-03 11:45:40 -06:00
Adam Hill
8ece19132d
deploy support for RCs, fix enable test
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-02 12:59:02 -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
38d76d7ec8
fix conftest path to VERSION
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-21 20:37:05 -06:00
Adam Hill
440a7a19a5
v4.2 and Version pulled from a file now
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-20 23:59:35 -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
a5211510db
Adding no-daemon opt back in which works with correct capabilities (NET_ADMIN)
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-01 14:46:34 -06:00
Adam Hill
d0b35cec63
4.1.1
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-24 11:23:17 -06:00
Adam Hill
5b3b0009bc
Added test to confirm updates are blocked
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-16 12:19:32 -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
b39a2ad69a
arm version complained/crashed on no TTY
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-13 18:33:08 -06:00
Adam Hill
d7a125a706
Version 4.1
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-12 20:43:08 -06:00