Merge pull request #14 from diginc/update_2.7_pi_1.3_admin

New versions, php5-openssl added for new GUI white/blacklist

AdminLTE_version.txt

@@ -1 +1 @@
-v1.2
+v1.3

alpine.docker

@@ -5,7 +5,7 @@ RUN apk add --update \
         dnsmasq \
         nginx \
         ca-certificates \
-        php5-fpm php5-json libxml2 \
+        php5-fpm php5-json php5-openssl libxml2 \
         bc bash curl perl && \
     apk add --update --repository http://dl-1.alpinelinux.org/alpine/edge/testing/ tini && \
     rm -rf /var/cache/apk/*

debian.docker

@@ -13,7 +13,7 @@ RUN apt-get -q update && \
     apt-get install -y \
         dnsmasq \
         lighttpd \
-        php5-common php5-cgi php5 \
+        php5-common php5-cgi php5-openssl php5 \
         bc curl unzip wget && \
     rm -rf /var/cache/apt/archives
 

pi-hole_version.txt

@@ -1 +1 @@
-v2.6.3
+v2.7

update.sh

@@ -1,6 +1,7 @@
 #!/bin/bash -x
 
 # Grab newest code and update version files
+git submodule foreach git pull;
 git submodule foreach git pull origin master;
 pushd pi-hole ; git describe --tags --abbrev=0 > ../pi-hole_version.txt ; popd ;
 pushd AdminLTE ; git describe --tags --abbrev=0 > ../AdminLTE_version.txt ; popd ;