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

This commit is contained in:
diginc 2016-06-15 23:27:16 -05:00
parent 123a64311c
commit 2df6e3d683
7 changed files with 7 additions and 6 deletions

@ -1 +1 @@
Subproject commit 25bc98348feae0b6ae3d43518043ea526d6ca3c1
Subproject commit 507f4fa791edfe4e632deb607319b529217d8fca

View File

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

View File

@ -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/*

View File

@ -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

@ -1 +1 @@
Subproject commit c03268707a1f85bd3079c32c7fc3f43ae5702b5e
Subproject commit 9ccf9d57a8df9c278baa320e58316db5832c6bd2

View File

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

View File

@ -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 ;