From 66fa12835a3426c72a05ba20eb3470809da3e1c3 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 24 Jan 2017 09:25:35 +0100
Subject: [PATCH] tech(build): replace grafana_branch with circle_branch;

---
 scripts/build/Dockerfile         | 17 ++++++++---------
 scripts/build/build.sh           |  6 ++----
 scripts/build/build_container.sh |  3 +++
 scripts/build/deploy.sh          |  6 +++++-
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/scripts/build/Dockerfile b/scripts/build/Dockerfile
index afb155b0827..bdbc047bec6 100644
--- a/scripts/build/Dockerfile
+++ b/scripts/build/Dockerfile
@@ -1,12 +1,11 @@
 FROM centos:6.6
 
-RUN yum install -y yum-plugin-ovl
-RUN yum install -y initscripts curl tar gcc libc6-dev git gcc-c++ openssl-devel
-RUN yum install -y g++ make automake autoconf curl-devel zlib-devel httpd-devel apr-devel apr-util-devel sqlite-devel
-RUN yum install -y wget yum-utils bzip2 bzip2-devel
-RUN yum install -y fontconfig freetype freetype-devel fontconfig-devel libstdc++
-RUN yum install -y rpm-build patch readline readline-devel libtool bison lzma
-RUN yum install -y which tar
+RUN yum install -y yum-plugin-ovl initscripts curl tar gcc libc6-dev git gcc-c++ openssl-devel \
+    yum install -y g++ make automake autoconf curl-devel zlib-devel httpd-devel apr-devel apr-util-devel sqlite-devel \
+    yum install -y wget yum-utils bzip2 bzip2-devel \
+    yum install -y fontconfig freetype freetype-devel fontconfig-devel libstdc++ \
+    yum install -y rpm-build patch readline readline-devel libtool bison lzma \
+    yum install -y which tar
 
 # Install RUBY 1.9.3
 # install necessary utilities
@@ -34,8 +33,8 @@ RUN mkdir -p /go/src /go/bin && chmod -R 777 /go
 ENV GOPATH /go
 ENV PATH /go/bin:$PATH
 
-ADD build.sh /tmp/
+ADD ./build.sh /tmp/
 
 WORKDIR /tmp/
 
-CMD ["build.sh"]
+CMD ["./build.sh"]
diff --git a/scripts/build/build.sh b/scripts/build/build.sh
index bfa90bfe6ed..f5b69db553b 100755
--- a/scripts/build/build.sh
+++ b/scripts/build/build.sh
@@ -10,11 +10,9 @@ REPO_PATH=$GOPATH/src/github.com/grafana/grafana
 mkdir -p /go/src/github.com/grafana
 cd /go/src/github.com/grafana
 
-echo "Grafana branch!!"
-echo $GRAFANA_BRANCH
-echo "GRAFANA BRANCH: ${GRAFANA_BRANCH}"
+echo "CIRCLE BRANCH: ${CIRCLE_BRANCH}"
 
-git clone --depth 1 https://github.com/grafana/grafana.git -b $GRAFANA_BRANCH
+git clone --depth 1 https://github.com/grafana/grafana.git -b $CIRCLE_BRANCH
 
 cd $REPO_PATH
 
diff --git a/scripts/build/build_container.sh b/scripts/build/build_container.sh
index 9ee9e573d86..f130e2f94db 100755
--- a/scripts/build/build_container.sh
+++ b/scripts/build/build_container.sh
@@ -3,6 +3,9 @@
 docker info && docker version
 mkdir -p ~/docker
 
+echo "Circle branch: ${CIRCLE_BRANCH}"
+echo "Circle tag: ${CIRCLE_TAG}"
+
 # try to load docker container from cache
 if [[ -e ~/docker/centos.tar ]]; then
   docker load -i ~/docker/centos.tar;
diff --git a/scripts/build/deploy.sh b/scripts/build/deploy.sh
index e1be0dde895..daf3b3edc8c 100755
--- a/scripts/build/deploy.sh
+++ b/scripts/build/deploy.sh
@@ -2,7 +2,11 @@
 
 mkdir -p dist
 
+echo "Circle branch: ${CIRCLE_BRANCH}"
+echo "Circle tag: ${CIRCLE_TAG}"
+echo "dist: $(pwd)/dist"
 docker run -i -t --name gfbuild \
   -v $(pwd)/dist:/tmp/dist \
-  -e "GRAFANA_BRANCH=${CIRCLE_BRANCH}" \
+  -e "CIRCLE_BRANCH=${CIRCLE_BRANCH}" \
+  -e "CIRCLE_TAG=${CIRCLE_BRANCH}" \
   grafana/buildcontainer