Merge pull request #96 from diginc/dev

Release dev to master

bash_functions.sh

@@ -1,5 +1,9 @@
 . /opt/pihole/webpage.sh
 
+prepare_setup_vars() {
+    touch "$setupVars"
+}
+
 validate_env() {
     if [ -z "$ServerIP" ] ; then
       echo "ERROR: To function correctly you must pass an environment variables of 'ServerIP' into the docker container with the IP of your docker host from which you are passing web (80) and dns (53) ports from"

start.sh

@@ -17,6 +17,7 @@ export IPv6
 
 echo " ::: Starting docker specific setup for docker diginc/pi-hole"
 validate_env
+prepare_setup_vars
 change_setting "IPV4_ADDRESS" "$ServerIP"
 change_setting "IPV6_ADDRESS" "$ServerIPv6"
 setup_dnsmasq_dns "$DNS1" "$DNS2"

test/test_000_build_containers.py

@@ -9,7 +9,7 @@
 @pytest.mark.parametrize("upstream,image,tag", [
     ( 'alpine:edge', 'alpine.docker', 'diginc/pi-hole:alpine' ),
     ( 'debian:jessie', 'debian.docker', 'diginc/pi-hole:debian' ),
-    ( 'jsurf/rpi-raspbian', 'debian-armhf.docker', 'diginc/pi-hole:arm' ),
+    #( 'jsurf/rpi-raspbian', 'debian-armhf.docker', 'diginc/pi-hole:arm' ),
 ])
 def test_build_pihole_image(upstream, image, tag):
     run_local('docker pull {}'.format(upstream))