From 6c267cb592bd0f5180152c860ddfd5bb4d9322b7 Mon Sep 17 00:00:00 2001
From: Leonard Gram <leo@xlson.com>
Date: Tue, 20 Nov 2018 17:00:20 +0100
Subject: [PATCH] build: docker build for ge.

---
 .circleci/config.yml                 |  1 +
 packaging/docker/build-enterprise.sh | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f8f0ba6789a..dc30554fc5c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -510,6 +510,7 @@ workflows:
       - grafana-docker-release:
           requires:
             - build-all
+            - build-all-enterprise
             - test-backend
             - test-frontend
             - codespell
diff --git a/packaging/docker/build-enterprise.sh b/packaging/docker/build-enterprise.sh
index 2f59e436d95..e10e0d691e8 100755
--- a/packaging/docker/build-enterprise.sh
+++ b/packaging/docker/build-enterprise.sh
@@ -1,9 +1,17 @@
 #!/bin/sh
 set -e
 
-_grafana_tag=$1
+_raw_grafana_tag=$1
 _docker_repo=${2:-grafana/grafana-enterprise}
 
+if echo "$_raw_grafana_tag" | grep -q "^v"; then
+  _grafana_tag=$(echo "${_raw_grafana_tag}" | cut -d "v" -f 2)
+else
+  _grafana_tag="${_raw_grafana_tag}"
+fi
+
+echo "Building and deploying ${_docker_repo}:${_grafana_tag}"
+
 docker build \
   --tag "${_docker_repo}:${_grafana_tag}"\
   --no-cache=true \