Merge branch 'dev' of github.com:diginc/docker-pi-hole into HEAD

doco-alpine.yml

@@ -1,11 +1,13 @@
-alpine:
-  image: diginc/pi-hole:alpine
-  environment:
-    # Your docker host IP is required if you run RUN (not build)
-    ServerIP: 192.168.1.55
-  ports:
-    - "53:53/tcp"
-    - "53:53/udp"
-    - "80:80/tcp"
-  cap_add:
-    - NET_ADMIN
+version: "3"
+services:
+  pihole:
+    image: diginc/pi-hole:alpine
+    environment:
+      # Your docker host IP is required if you run RUN (not build)
+      ServerIP: 192.168.1.55
+    ports:
+      - "53:53/tcp"
+      - "53:53/udp"
+      - "80:80/tcp"
+    cap_add:
+      - NET_ADMIN

install.sh

@@ -1,5 +1,7 @@
 #!/bin/bash -x
 mkdir -p /etc/pihole/
+export CORE_TAG='v2.12'
+export WEB_TAG='v2.4'
 
 #     Make pihole scripts fail searching for `systemctl`,
 # which fails pretty miserably in docker compared to `service`
@@ -9,7 +11,7 @@ mv "$(which systemctl)" /bin/no_systemctl && \
 mv "$(which debconf-apt-progress)" /bin/no_debconf-apt-progress
 
 # Get the install functions
-wget -O "$PIHOLE_INSTALL" https://install.pi-hole.net
+wget -O "$PIHOLE_INSTALL" https://raw.githubusercontent.com/pi-hole/pi-hole/${CORE_TAG}/automated%20install/basic-install.sh
 if [[ "$IMAGE" == 'alpine' ]] ; then
     sed -i '/OS distribution not supported/ i\  echo "Hi Alpine"' "$PIHOLE_INSTALL"
     sed -i '/OS distribution not supported/,+1d' "$PIHOLE_INSTALL"
@@ -29,6 +31,7 @@ PH_TEST=true . "${PIHOLE_INSTALL}"
 # Run only what we need from installer
 export USER=pihole
 if [[ "$IMAGE" == 'debian' ]] ; then
+    distro_check
     install_dependent_packages INSTALLER_DEPS[@]
     install_dependent_packages PIHOLE_DEPS[@]
     sed -i "/sleep 2/ d" /etc/init.d/dnsmasq # SLOW
@@ -40,8 +43,11 @@ elif [[ "$IMAGE" == 'alpine' ]] ; then
         php5-fpm php5-json php5-openssl php5-zip libxml2 \
         bc bash curl perl sudo git
 fi
-git clone --depth 1 "${piholeGitUrl}" "${PI_HOLE_LOCAL_REPO}"
-git clone --depth 1 "${webInterfaceGitUrl}" "${webInterfaceDir}"
+
+git clone "${piholeGitUrl}" "${PI_HOLE_LOCAL_REPO}"
+pushd "${PI_HOLE_LOCAL_REPO}"; git checkout "${CORE_TAG}"; popd;
+git clone "${webInterfaceGitUrl}" "${webInterfaceDir}"
+pushd "${webInterfaceDir}"; git checkout "${WEB_TAG}"; popd;
 
 export PIHOLE_INTERFACE=eth0
 export IPV4_ADDRESS=0.0.0.0