Browse Source

build: docker build for ge.

Leonard Gram 7 years ago
parent
commit
6c267cb592
2 changed files with 10 additions and 1 deletions
  1. 1 0
      .circleci/config.yml
  2. 9 1
      packaging/docker/build-enterprise.sh

+ 1 - 0
.circleci/config.yml

@@ -510,6 +510,7 @@ workflows:
       - grafana-docker-release:
           requires:
             - build-all
+            - build-all-enterprise
             - test-backend
             - test-frontend
             - codespell

+ 9 - 1
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 \