Pi-Hole/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2026-04-21 09:19:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

delete all the alpine

Browse Source
This commit is contained in:
diginc
2018-01-03 20:09:47 -06:00
parent d9fa9b1016
commit 615af98eab
32 changed files with 19 additions and 533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/conftest.py
View File

@@ -58,12 +58,11 @@ def args(request):
def arch(request):
return request.param
@pytest.fixture(params=['debian', 'alpine'])
@pytest.fixture(params=['debian'])
def os(request):
return request.param
@pytest.fixture()
@pytest.mark.skipif((os == 'alpine' and arch == 'aarch64'), 'musl does not have aarch64 yet')
def tag(request, os, arch):
return '{}_{}'.format(os, arch)
@@ -90,7 +89,7 @@ def persist_arch(request):
'''amd64 only, dnsmasq will not start under qemu-user-static :('''
return request.param
@pytest.fixture(scope='module', params=['debian', 'alpine'])
@pytest.fixture(scope='module', params=['debian'])
def persist_os(request):
return request.param
@@ -98,7 +97,6 @@ def persist_os(request):
def persist_args(request):
return '-e ServerIP="127.0.0.1" -e ServerIPv6="::1"'
@pytest.mark.skipif((persist_os == 'alpine' and persist_arch == 'aarch64'), 'musl does not have aarch64 yet')
@pytest.fixture(scope='module')
def persist_tag(request, persist_os, persist_arch):
return '{}_{}'.format(persist_os, persist_arch)