From 6bf15d65774503cd4d241761373e28291154b736 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Mon, 24 Feb 2020 18:05:02 +0000 Subject: [PATCH 1/2] update for core 4.3.4 Signed-off-by: Adam Warner --- Dockerfile_amd64 | 4 ++-- Dockerfile_arm64 | 4 ++-- Dockerfile_armel | 4 ++-- Dockerfile_armhf | 4 ++-- VERSION | 2 +- install.sh | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dockerfile_amd64 b/Dockerfile_amd64 index a3a3883..fc7882c 100644 --- a/Dockerfile_amd64 +++ b/Dockerfile_amd64 @@ -37,10 +37,10 @@ ENV ServerIP 0.0.0.0 ENV FTL_CMD no-daemon ENV DNSMASQ_USER root -ENV VERSION v4.3.3 +ENV VERSION v4.3.4 ENV PATH /opt/pihole:${PATH} -LABEL image="pihole/pihole:v4.3.3_amd64" +LABEL image="pihole/pihole:v4.3.4_amd64" LABEL maintainer="adam@diginc.us" LABEL url="https://www.github.com/pi-hole/docker-pi-hole" diff --git a/Dockerfile_arm64 b/Dockerfile_arm64 index cede65c..a3347be 100644 --- a/Dockerfile_arm64 +++ b/Dockerfile_arm64 @@ -37,10 +37,10 @@ ENV ServerIP 0.0.0.0 ENV FTL_CMD no-daemon ENV DNSMASQ_USER root -ENV VERSION v4.3.3 +ENV VERSION v4.3.4 ENV PATH /opt/pihole:${PATH} -LABEL image="pihole/pihole:v4.3.3_arm64" +LABEL image="pihole/pihole:v4.3.4_arm64" LABEL maintainer="adam@diginc.us" LABEL url="https://www.github.com/pi-hole/docker-pi-hole" diff --git a/Dockerfile_armel b/Dockerfile_armel index 8c97983..3ffd82b 100644 --- a/Dockerfile_armel +++ b/Dockerfile_armel @@ -37,10 +37,10 @@ ENV ServerIP 0.0.0.0 ENV FTL_CMD no-daemon ENV DNSMASQ_USER root -ENV VERSION v4.3.3 +ENV VERSION v4.3.4 ENV PATH /opt/pihole:${PATH} -LABEL image="pihole/pihole:v4.3.3_armel" +LABEL image="pihole/pihole:v4.3.4_armel" LABEL maintainer="adam@diginc.us" LABEL url="https://www.github.com/pi-hole/docker-pi-hole" diff --git a/Dockerfile_armhf b/Dockerfile_armhf index 611e6c0..807746a 100644 --- a/Dockerfile_armhf +++ b/Dockerfile_armhf @@ -37,10 +37,10 @@ ENV ServerIP 0.0.0.0 ENV FTL_CMD no-daemon ENV DNSMASQ_USER root -ENV VERSION v4.3.2 +ENV VERSION v4.3.4 ENV PATH /opt/pihole:${PATH} -LABEL image="pihole/pihole:v4.3.2_armhf" +LABEL image="pihole/pihole:v4.3.4_armhf" LABEL maintainer="adam@diginc.us" LABEL url="https://www.github.com/pi-hole/docker-pi-hole" diff --git a/VERSION b/VERSION index 5d3e685..e9dc90d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v4.3.3 +v4.3.4 diff --git a/install.sh b/install.sh index 2126319..9748e3d 100755 --- a/install.sh +++ b/install.sh @@ -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="$(cat /etc/docker-pi-hole-version)" +export WEB_VERSION="v4.3.3" # Only use for pre-production / testing export CHECKOUT_BRANCHES=false From c0c72219a9f37e1d8fe0b5f8cd1f8ab7d177a016 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Mon, 24 Feb 2020 20:18:27 +0000 Subject: [PATCH 2/2] Did I say 4.3.4? I spoke too soon Signed-off-by: Adam Warner --- Dockerfile_amd64 | 4 ++-- Dockerfile_arm64 | 4 ++-- Dockerfile_armel | 4 ++-- Dockerfile_armhf | 4 ++-- VERSION | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile_amd64 b/Dockerfile_amd64 index fc7882c..96e5b4a 100644 --- a/Dockerfile_amd64 +++ b/Dockerfile_amd64 @@ -37,10 +37,10 @@ ENV ServerIP 0.0.0.0 ENV FTL_CMD no-daemon ENV DNSMASQ_USER root -ENV VERSION v4.3.4 +ENV VERSION v4.3.5 ENV PATH /opt/pihole:${PATH} -LABEL image="pihole/pihole:v4.3.4_amd64" +LABEL image="pihole/pihole:v4.3.5_amd64" LABEL maintainer="adam@diginc.us" LABEL url="https://www.github.com/pi-hole/docker-pi-hole" diff --git a/Dockerfile_arm64 b/Dockerfile_arm64 index a3347be..7d89c44 100644 --- a/Dockerfile_arm64 +++ b/Dockerfile_arm64 @@ -37,10 +37,10 @@ ENV ServerIP 0.0.0.0 ENV FTL_CMD no-daemon ENV DNSMASQ_USER root -ENV VERSION v4.3.4 +ENV VERSION v4.3.5 ENV PATH /opt/pihole:${PATH} -LABEL image="pihole/pihole:v4.3.4_arm64" +LABEL image="pihole/pihole:v4.3.5_arm64" LABEL maintainer="adam@diginc.us" LABEL url="https://www.github.com/pi-hole/docker-pi-hole" diff --git a/Dockerfile_armel b/Dockerfile_armel index 3ffd82b..c775de0 100644 --- a/Dockerfile_armel +++ b/Dockerfile_armel @@ -37,10 +37,10 @@ ENV ServerIP 0.0.0.0 ENV FTL_CMD no-daemon ENV DNSMASQ_USER root -ENV VERSION v4.3.4 +ENV VERSION v4.3.5 ENV PATH /opt/pihole:${PATH} -LABEL image="pihole/pihole:v4.3.4_armel" +LABEL image="pihole/pihole:v4.3.5_armel" LABEL maintainer="adam@diginc.us" LABEL url="https://www.github.com/pi-hole/docker-pi-hole" diff --git a/Dockerfile_armhf b/Dockerfile_armhf index 807746a..a76e287 100644 --- a/Dockerfile_armhf +++ b/Dockerfile_armhf @@ -37,10 +37,10 @@ ENV ServerIP 0.0.0.0 ENV FTL_CMD no-daemon ENV DNSMASQ_USER root -ENV VERSION v4.3.4 +ENV VERSION v4.3.5 ENV PATH /opt/pihole:${PATH} -LABEL image="pihole/pihole:v4.3.4_armhf" +LABEL image="pihole/pihole:v4.3.5_armhf" LABEL maintainer="adam@diginc.us" LABEL url="https://www.github.com/pi-hole/docker-pi-hole" diff --git a/VERSION b/VERSION index e9dc90d..5343eea 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v4.3.4 +v4.3.5