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

Merge pull request #581 from pi-hole/v4.4 

target core version 4.4
This commit is contained in:
Dan Schaper 2020-02-25 15:39:19 -08:00 committed by GitHub
parent d102ba94e5 ca9bf8ce5c
commit 76d2578b77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile_amd64
View File

@ -37,10 +37,10 @@ ENV ServerIP 0.0.0.0
ENV FTL_CMD no-daemon
ENV DNSMASQ_USER root
ENV VERSION v4.3.5
ENV VERSION v4.4
ENV PATH /opt/pihole:${PATH}
LABEL image="pihole/pihole:v4.3.5_amd64"
LABEL image="pihole/pihole:v4.4_amd64"
LABEL maintainer="adam@diginc.us"
LABEL url="https://www.github.com/pi-hole/docker-pi-hole"

4
Dockerfile_arm64
View File

@ -37,10 +37,10 @@ ENV ServerIP 0.0.0.0
ENV FTL_CMD no-daemon
ENV DNSMASQ_USER root
ENV VERSION v4.3.5
ENV VERSION v4.4
ENV PATH /opt/pihole:${PATH}
LABEL image="pihole/pihole:v4.3.5_arm64"
LABEL image="pihole/pihole:v4.4_arm64"
LABEL maintainer="adam@diginc.us"
LABEL url="https://www.github.com/pi-hole/docker-pi-hole"

4
Dockerfile_armel
View File

@ -37,10 +37,10 @@ ENV ServerIP 0.0.0.0
ENV FTL_CMD no-daemon
ENV DNSMASQ_USER root
ENV VERSION v4.3.5
ENV VERSION v4.4
ENV PATH /opt/pihole:${PATH}
LABEL image="pihole/pihole:v4.3.5_armel"
LABEL image="pihole/pihole:v4.4_armel"
LABEL maintainer="adam@diginc.us"
LABEL url="https://www.github.com/pi-hole/docker-pi-hole"

4
Dockerfile_armhf
View File

@ -37,10 +37,10 @@ ENV ServerIP 0.0.0.0
ENV FTL_CMD no-daemon
ENV DNSMASQ_USER root
ENV VERSION v4.3.5
ENV VERSION v4.4
ENV PATH /opt/pihole:${PATH}
LABEL image="pihole/pihole:v4.3.5_armhf"
LABEL image="pihole/pihole:v4.4_armhf"
LABEL maintainer="adam@diginc.us"
LABEL url="https://www.github.com/pi-hole/docker-pi-hole"

2
VERSION
View File

@ -1 +1 @@
v4.3.5
v4.4

6
test/test_bash_functions.py
View File

@ -40,7 +40,7 @@ def test_overrides_default_WEB_PORT(Docker, Slow, test_args):
# grep fails to find any of the old address w/o port
#assert Docker.run('grep -r "://127.0.0.1/" /var/www/html/').stdout == ''
#assert Docker.run('grep -r "://pi.hole/" /var/www/html/').stdout == ''
## Find at least one instance of our changes
## Find at least one instance of our changes
## upstream repos determines how many and I don't want to keep updating this test
#assert int(Docker.run('grep -rl "://127.0.0.1:999/" /var/www/html/ | wc -l').stdout) >= 1
#assert int(Docker.run('grep -rl "://pi.hole:999/" /var/www/html/ | wc -l').stdout) >= 1
@ -72,7 +72,7 @@ def test_override_default_servers_with_DNS_EnvVars(Docker, Slow, args_env, expec
function = Docker.run('. /bash_functions.sh ; eval `grep "^setup_dnsmasq " /start.sh`')
assert expected_stdout in function.stdout
expected_servers = 'server={}\n'.format(dns1) if dns2 == None else 'server={}\nserver={}\n'.format(dns1, dns2)
Slow(lambda: expected_servers == Docker.run('grep "^server=" /etc/dnsmasq.d/01-pihole.conf').stdout)
Slow(lambda: expected_servers == Docker.run('grep "^server=[^/]" /etc/dnsmasq.d/01-pihole.conf').stdout)
@pytest.mark.skipif(os.environ.get('TRAVIS') == 'true',
@ -112,7 +112,7 @@ def test_DNS_Envs_are_secondary_to_setupvars(Docker, Slow, args_env, expected_st
expected_servers = ['server={}'.format(dns1)]
if dns2:
expected_servers.append('server={}'.format(dns2))
Slow(lambda: Docker.run('grep "^server=" /etc/dnsmasq.d/01-pihole.conf').stdout.strip().split('\n') == \
Slow(lambda: Docker.run('grep "^server=[^/]" /etc/dnsmasq.d/01-pihole.conf').stdout.strip().split('\n') == \
expected_servers)