Official tag time

Signed-off-by: Adam Hill <[email protected]>
mvnixon · May 18, 2019 · 874c4b7 · 874c4b7
1 parent e3f42c8
commit 874c4b7
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git 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="[email protected]"
 LABEL url="https://www.github.com/pi-hole/docker-pi-hole"
 

diff --git 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="[email protected]"
 LABEL url="https://www.github.com/pi-hole/docker-pi-hole"
 

diff --git 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="[email protected]"
 LABEL url="https://www.github.com/pi-hole/docker-pi-hole"
 

diff --git 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="[email protected]"
 LABEL url="https://www.github.com/pi-hole/docker-pi-hole"
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-release/v4.3
+v4.3
diff --git 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