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

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

Signed-off-by: Adam Hill <adam@diginc.us>
This commit is contained in:
Adam Hill 2019-07-02 00:00:43 -05:00
parent f226e090fe 4eb10fd63a
commit 7418b6adee
No known key found for this signature in database
GPG Key ID: 2193804FCA429855
6 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile_aarch64
View File

@ -35,11 +35,11 @@ ENV ServerIP 0.0.0.0
ENV FTL_CMD no-daemon
ENV DNSMASQ_USER root
ENV VERSION v4.3
ENV VERSION v4.3.1
ENV ARCH aarch64
ENV PATH /opt/pihole:${PATH}
LABEL image="pihole/pihole:v4.3_aarch64"
LABEL image="pihole/pihole:v4.3.1_aarch64"
LABEL maintainer="adam@diginc.us"
LABEL url="https://www.github.com/pi-hole/docker-pi-hole"

4
Dockerfile_amd64
View File

@ -35,11 +35,11 @@ ENV ServerIP 0.0.0.0
ENV FTL_CMD no-daemon
ENV DNSMASQ_USER root
ENV VERSION v4.3
ENV VERSION v4.3.1
ENV ARCH amd64
ENV PATH /opt/pihole:${PATH}
LABEL image="pihole/pihole:v4.3_amd64"
LABEL image="pihole/pihole:v4.3.1_amd64"
LABEL maintainer="adam@diginc.us"
LABEL url="https://www.github.com/pi-hole/docker-pi-hole"

4
Dockerfile_armel
View File

@ -35,11 +35,11 @@ ENV ServerIP 0.0.0.0
ENV FTL_CMD no-daemon
ENV DNSMASQ_USER root
ENV VERSION v4.3
ENV VERSION v4.3.1
ENV ARCH armel
ENV PATH /opt/pihole:${PATH}
LABEL image="pihole/pihole:v4.3_armel"
LABEL image="pihole/pihole:v4.3.1_armel"
LABEL maintainer="adam@diginc.us"
LABEL url="https://www.github.com/pi-hole/docker-pi-hole"

4
Dockerfile_armhf
View File

@ -35,11 +35,11 @@ ENV ServerIP 0.0.0.0
ENV FTL_CMD no-daemon
ENV DNSMASQ_USER root
ENV VERSION v4.3
ENV VERSION v4.3.1
ENV ARCH armhf
ENV PATH /opt/pihole:${PATH}
LABEL image="pihole/pihole:v4.3_armhf"
LABEL image="pihole/pihole:v4.3.1_armhf"
LABEL maintainer="adam@diginc.us"
LABEL url="https://www.github.com/pi-hole/docker-pi-hole"

2
VERSION
View File

@ -1 +1 @@
v4.3
v4.3.1

18
install.sh
View File

@ -4,7 +4,7 @@ mkdir -p /etc/pihole/
mkdir -p /var/run/pihole
# Production tags with valid web footers
export CORE_VERSION="$(cat /etc/docker-pi-hole-version)"
export WEB_VERSION="${CORE_VERSION}"
export WEB_VERSION="v4.3"
# Only use for pre-production / testing
export CHECKOUT_BRANCHES=false
@ -67,6 +67,18 @@ FTLdetect 2>&1 | tee "${tmpLog}"
installPihole 2>&1 | tee "${tmpLog}"
mv "${tmpLog}" /
fetch_release_metadata() {
local directory="$1"
local version="$2"
pushd "$directory"
git fetch -t
git remote set-branches origin '*'
git fetch --depth 10
git checkout master
git reset --hard "$version"
popd
}
if [[ $CHECKOUT_BRANCHES == true ]] ; then
ln -s /bin/true /usr/local/bin/service
ln -s /bin/true /usr/local/bin/update-rc.d
@ -78,8 +90,8 @@ if [[ $CHECKOUT_BRANCHES == true ]] ; then
unlink /usr/local/bin/update-rc.d
else
# Reset to our tags so version numbers get detected correctly
pushd "${PI_HOLE_LOCAL_REPO}"; git reset --hard "${CORE_VERSION}"; popd;
pushd "${webInterfaceDir}"; git reset --hard "${WEB_VERSION}"; popd;
fetch_release_metadata "${PI_HOLE_LOCAL_REPO}" "${CORE_VERSION}"
fetch_release_metadata "${webInterfaceDir}" "${WEB_VERSION}"
fi
sed -i 's/readonly //g' /opt/pihole/webpage.sh