docker
/
docker-pi-hole
mirror of https://github.com/pi-hole/docker-pi-hole.git
1
0
Fork 0
Code Issues Releases Wiki Activity

update deploy version to 4.1 and fix broken server test 

Signed-off-by: Adam Hill <adam@diginc.us>
This commit is contained in:
Adam Hill 2018-12-13 18:33:38 -06:00
parent b39a2ad69a
commit b3beb91b52
No known key found for this signature in database
GPG Key ID: 2193804FCA429855
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deploy_docker.sh
View File

@ -65,7 +65,7 @@ $dry tox
images=()
for tag in ${!arch_map[@]}; do
# Verison specific tags for ongoing history
$dry docker tag $localimg:v4.0_$tag $remoteimg:${version}_${tag}
$dry docker tag $localimg:v4.1_$tag $remoteimg:${version}_${tag}
$dry docker push pihole/pihole:${version}_${tag}
images+=(pihole/pihole:${version}_${tag})
done

10
test/test_bash_functions.py
View File

@ -104,9 +104,13 @@ def test_DNS_Envs_are_secondary_to_setupvars(Docker, args, expected_stdout, dns1
assert expected_stdout in function.stdout
expected_servers = 'server={}\nserver={}\n'.format(dns1, dns2)
servers = Docker.run('grep "^server=" /etc/dnsmasq.d/01-pihole.conf').stdout
searchDns1 = servers.split('\n')[0]
searchDns2 = servers.split('\n')[1]
servers = Docker.run('grep "^server=" /etc/dnsmasq.d/01-pihole.conf')
servers = servers.stdout.strip().split('\n')
expected_count = 2
if len(servers) != expected_count:
assert False, "{} is not {}".format(servers, expected_count)
searchDns1 = servers[0]
searchDns2 = servers[1]
# Then the servers are still what the user had customized if forced dnsmasq is not set
assert 'server={}'.format(dns1) == searchDns1