Pi-Hole/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2025-12-24 04:18:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

debian converted to s6, aline files moved

Browse Source
This commit is contained in:
diginc
2017-05-05 21:48:03 -05:00
parent 20955a41fe
commit 9f61b87198
25 changed files with 69 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/conftest.py
View File

@@ -10,8 +10,8 @@ check_output = testinfra.get_backend(
def DockerGeneric(request, args, image, cmd):
assert 'docker' in check_output('id'), "Are you in the docker group?"
if 'diginc/pi-hole' in image:
#args += " -v /dev/null:/etc/pihole/adlists.default -e PYTEST=\"True\""
args += " -e PYTEST=\"True\""
args += " -v /dev/null:/etc/pihole/adlists.default -e PYTEST=\"True\""
#args += " -e PYTEST=\"True\""
docker_run = "docker run -d {} {} {}".format(args, image, cmd)
docker_id = check_output(docker_run)