From 874c4b757b6542f23407be9fbbb52b9f3f49947a Mon Sep 17 00:00:00 2001 From: Adam Hill Date: Sat, 18 May 2019 18:25:14 -0500 Subject: [PATCH] Official tag time Signed-off-by: Adam Hill --- Dockerfile_aarch64 | 4 ++-- Dockerfile_amd64 | 4 ++-- Dockerfile_armel | 4 ++-- Dockerfile_armhf | 4 ++-- VERSION | 2 +- deploy_docker.sh | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dockerfile_aarch64 b/Dockerfile_aarch64 index 3ae8829dc..fad1a351a 100644 --- a/Dockerfile_aarch64 +++ b/Dockerfile_aarch64 @@ -35,11 +35,11 @@ ENV ServerIP 0.0.0.0 ENV FTL_CMD no-daemon ENV DNSMASQ_USER root -ENV VERSION release-v4.3 +ENV VERSION v4.3 ENV ARCH aarch64 ENV PATH /opt/pihole:${PATH} -LABEL image="pihole/pihole:release-v4.3_aarch64" +LABEL image="pihole/pihole:v4.3_aarch64" LABEL maintainer="adam@diginc.us" LABEL url="https://www.github.com/pi-hole/docker-pi-hole" diff --git a/Dockerfile_amd64 b/Dockerfile_amd64 index ab013d2eb..2721363fe 100644 --- a/Dockerfile_amd64 +++ b/Dockerfile_amd64 @@ -35,11 +35,11 @@ ENV ServerIP 0.0.0.0 ENV FTL_CMD no-daemon ENV DNSMASQ_USER root -ENV VERSION release-v4.3 +ENV VERSION v4.3 ENV ARCH amd64 ENV PATH /opt/pihole:${PATH} -LABEL image="pihole/pihole:release-v4.3_amd64" +LABEL image="pihole/pihole:v4.3_amd64" 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 b3d5805cf..17411cbdb 100644 --- a/Dockerfile_armel +++ b/Dockerfile_armel @@ -35,11 +35,11 @@ ENV ServerIP 0.0.0.0 ENV FTL_CMD no-daemon ENV DNSMASQ_USER root -ENV VERSION release-v4.3 +ENV VERSION v4.3 ENV ARCH armel ENV PATH /opt/pihole:${PATH} -LABEL image="pihole/pihole:release-v4.3_armel" +LABEL image="pihole/pihole:v4.3_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 0411fe9c4..f66938374 100644 --- a/Dockerfile_armhf +++ b/Dockerfile_armhf @@ -35,11 +35,11 @@ ENV ServerIP 0.0.0.0 ENV FTL_CMD no-daemon ENV DNSMASQ_USER root -ENV VERSION release-v4.3 +ENV VERSION v4.3 ENV ARCH armhf ENV PATH /opt/pihole:${PATH} -LABEL image="pihole/pihole:release-v4.3_armhf" +LABEL image="pihole/pihole:v4.3_armhf" LABEL maintainer="adam@diginc.us" LABEL url="https://www.github.com/pi-hole/docker-pi-hole" diff --git a/VERSION b/VERSION index 98720d832..b570a0ac2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -release/v4.3 +v4.3 diff --git a/deploy_docker.sh b/deploy_docker.sh index db43e4a18..97126095d 100755 --- a/deploy_docker.sh +++ b/deploy_docker.sh @@ -46,7 +46,7 @@ if [[ "$version" == 'unset' ]]; then if [[ "$branch" == "master" ]]; then echo "Version number var is unset and master branch needs a version...pass in \$version variable!" exit 1 - elif [[ "$branch" = "release/"* ]]; then + elif [[ "$branch" == "release-"* ]]; then version="$(echo $branch | grep -Po 'v[\d\w\.-]*')" echo "Version number is being taken from this release branch $version" else