tech(build): replace grafana_branch with circle_branch;

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"]

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
 

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;

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