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

common_start.sh now bash_functions.sh, dnsmasq test clarified

This commit is contained in:
diginc 2016-10-30 13:47:06 -05:00
parent 7325ae336c
commit 99c4921a84
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
alpine.docker
View File

@ -64,7 +64,7 @@ RUN grep -q '^user=root' || echo 'user=root' >> /etc/dnsmasq.conf
ENV PHP_ENV_CONFIG '/etc/php5/fpm.d/envs.conf'
ENV PHP_ERROR_LOG '/var/log/nginx/error.log'
COPY ./start.sh /
COPY ./common_start.sh /
COPY ./bash_functions.sh /
# IPV6 disable flag for networks/devices that do not support it
ENV IPv6 True

0
common_start.sh → bash_functions.sh
View File

2
debian-armhf.docker
View File

@ -60,7 +60,7 @@ RUN grep -q '^user=root' || echo 'user=root' >> /etc/dnsmasq.conf
ENV PHP_ENV_CONFIG '/etc/lighttpd/conf-enabled/15-fastcgi-php.conf'
ENV PHP_ERROR_LOG '/var/log/lighttpd/error.log'
COPY ./start.sh /
COPY ./common_start.sh /
COPY ./bash_functions.sh /
# IPv6 disable flag for networks/devices that do not support it
# not fully supported in debian yet

2
debian.docker
View File

@ -66,7 +66,7 @@ RUN grep -q '^user=root' || echo 'user=root' >> /etc/dnsmasq.conf
ENV PHP_ENV_CONFIG '/etc/lighttpd/conf-enabled/15-fastcgi-php.conf'
ENV PHP_ERROR_LOG '/var/log/lighttpd/error.log'
COPY ./start.sh /
COPY ./common_start.sh /
COPY ./bash_functions.sh /
# IPv6 disable flag for networks/devices that do not support it
# not fully supported in debian yet

2
start.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash -e
. /common_start.sh
. /bash_functions.sh
# Dockerfile variables
export IMAGE
export ServerIP

4
test/test_start.py
View File

@ -35,7 +35,7 @@ def test_ServerIP_missing_triggers_start_error(Docker):
@pytest.mark.parametrize('cmd', [ 'tail -f /dev/null' ])
def test_IPv6_not_True_removes_ipv6(Docker, tag, args, expected_ipv6, expected_stdout):
''' When a user overrides IPv6=True they only get IPv4 listening webservers '''
function = Docker.run('. /common_start.sh ; setup_ipv4_ipv6')
function = Docker.run('. /bash_functions.sh ; setup_ipv4_ipv6')
assert "Using {}".format(expected_stdout) in function.stdout
ipv6 = Docker.run('grep -q \'{}\' {}'.format(IPV6_LINE[tag], WEB_CONFIG[tag])).rc == 0
assert ipv6 == expected_ipv6
@ -49,7 +49,7 @@ def test_IPv6_not_True_removes_ipv6(Docker, tag, args, expected_ipv6, expected_s
@pytest.mark.parametrize('cmd', [ 'tail -f /dev/null' ])
def test_DNS_Envs_override_defaults(Docker, args, expected_stdout, dns1, dns2):
''' When DNS environment vars are passed in, they override default dns servers '''
function = Docker.run('. /common_start.sh ; eval `grep setup_dnsmasq /start.sh`')
function = Docker.run('. /bash_functions.sh ; eval `grep setup_dnsmasq_dns /start.sh`')
assert expected_stdout in function.stdout
docker_dns_servers = Docker.run('grep "^server=" /etc/dnsmasq.d/01-pihole.conf').stdout