From a237a495b0b5bb0921735ff560d3ec977e4b90f1 Mon Sep 17 00:00:00 2001
From: Leonard Gram <leo@xlson.com>
Date: Wed, 9 Jan 2019 16:14:03 +0100
Subject: [PATCH] Revert "build: fixes docker push."

This reverts commit be57f6878cd094893005a179f66de19f17fe9fd5.
---
 packaging/docker/build.sh              |  8 ++++----
 packaging/docker/push_to_docker_hub.sh | 11 +++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/packaging/docker/build.sh b/packaging/docker/build.sh
index 1bad2980d34..860df4780b5 100755
--- a/packaging/docker/build.sh
+++ b/packaging/docker/build.sh
@@ -1,13 +1,14 @@
 #!/bin/sh
 
-_grafana_tag=${1:-}
-_docker_repo=${2:-grafana/grafana}
+_grafana_tag=$1
 
 # If the tag starts with v, treat this as a official release
 if echo "$_grafana_tag" | grep -q "^v"; then
 	_grafana_version=$(echo "${_grafana_tag}" | cut -d "v" -f 2)
+	_docker_repo=${2:-grafana/grafana}
 else
 	_grafana_version=$_grafana_tag
+	_docker_repo=${2:-grafana/grafana-dev}
 fi
 
 echo "Building ${_docker_repo}:${_grafana_version}"
@@ -44,6 +45,5 @@ docker_build "arm64v8/debian:stretch-slim" "grafana-latest.linux-arm64.tar.gz" "
 if echo "$_grafana_tag" | grep -q "^v"; then
 	docker_tag_all "${_docker_repo}" "latest"
 else
-	docker_tag_all "${_docker_repo}" "master"
-	docker tag "${_docker_repo}:${_grafana_version} grafana/grafana-dev:${_grafana_version}"
+	docker_tag_all "grafana/grafana" "master"
 fi
diff --git a/packaging/docker/push_to_docker_hub.sh b/packaging/docker/push_to_docker_hub.sh
index cef6d596851..b873dbe05e0 100755
--- a/packaging/docker/push_to_docker_hub.sh
+++ b/packaging/docker/push_to_docker_hub.sh
@@ -1,14 +1,15 @@
 #!/bin/sh
 set -e
 
-_grafana_tag=${1:-}
-_docker_repo=${2:-grafana/grafana}
+_grafana_tag=$1
 
 # If the tag starts with v, treat this as a official release
 if echo "$_grafana_tag" | grep -q "^v"; then
 	_grafana_version=$(echo "${_grafana_tag}" | cut -d "v" -f 2)
+	_docker_repo=${2:-grafana/grafana}
 else
 	_grafana_version=$_grafana_tag
+	_docker_repo=${2:-grafana/grafana-dev}
 fi
 
 export DOCKER_CLI_EXPERIMENTAL=enabled
@@ -34,13 +35,11 @@ docker_push_all () {
 	docker manifest push "${repo}:${tag}"
 }
 
+docker_push_all "${_docker_repo}" "${_grafana_version}"
+
 if echo "$_grafana_tag" | grep -q "^v" && echo "$_grafana_tag" | grep -vq "beta"; then
 	echo "pushing ${_docker_repo}:latest"
 	docker_push_all "${_docker_repo}" "latest"
-	docker_push_all "${_docker_repo}" "${_grafana_version}"
-elif echo "$_grafana_tag" | grep -q "^v" && echo "$_grafana_tag" | grep -q "beta"; then
-	docker_push_all "${_docker_repo}" "${_grafana_version}"
 elif echo "$_grafana_tag" | grep -q "master"; then
 	docker_push_all "grafana/grafana" "master"
-	docker push "grafana/grafana-dev:${_grafana_version}"
 fi