From cc89bc02f4c0986a5eb03cead4e458c8c6f3d335 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Sat, 7 Mar 2015 12:40:19 +0100
Subject: [PATCH] Working on trying to get CI builds on centos6 to solve GLIBC
 issue, #1568

---
 build.go                         |  3 +--
 circle.yml                       |  6 ++++++
 docker/buildcontainer/Dockerfile | 20 ++++++++++++++++++++
 docker/buildcontainer/build.sh   | 10 ++++++++++
 docker/debtest/Dockerfile        |  2 +-
 docker/rpmtest/Dockerfile        |  4 ++--
 6 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 circle.yml
 create mode 100644 docker/buildcontainer/Dockerfile
 create mode 100755 docker/buildcontainer/build.sh

diff --git a/build.go b/build.go
index f4b4a1fb884..be2de0cbe4c 100644
--- a/build.go
+++ b/build.go
@@ -64,9 +64,8 @@ func main() {
 
 		case "build":
 			pkg := "."
-			var tags []string
 			clean()
-			build(pkg, tags)
+			build(pkg, []string{})
 
 		case "test":
 			test("./pkg/...")
diff --git a/circle.yml b/circle.yml
new file mode 100644
index 00000000000..4cb4c278a32
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,6 @@
+machine:
+  services:
+    - docker
+
+test:
+  - go test -v ./pkg/...
diff --git a/docker/buildcontainer/Dockerfile b/docker/buildcontainer/Dockerfile
new file mode 100644
index 00000000000..f2ec8d92654
--- /dev/null
+++ b/docker/buildcontainer/Dockerfile
@@ -0,0 +1,20 @@
+FROM centos:6.6
+
+RUN yum install -y initscripts curl tar gcc libc6-dev git
+
+ENV GOLANG_VERSION 1.4.2
+
+RUN curl -sSL https://golang.org/dl/go$GOLANG_VERSION.src.tar.gz \
+		| tar -v -C /usr/src -xz
+
+RUN cd /usr/src/go/src && ./make.bash --no-clean 2>&1
+
+ENV PATH /usr/src/go/bin:$PATH
+
+RUN mkdir -p /go/src /go/bin && chmod -R 777 /go
+ENV GOPATH /go
+ENV PATH /go/bin:$PATH
+
+WORKDIR /go
+
+
diff --git a/docker/buildcontainer/build.sh b/docker/buildcontainer/build.sh
new file mode 100755
index 00000000000..ec73c22397d
--- /dev/null
+++ b/docker/buildcontainer/build.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+docker kill gfbuild
+docker rm gfbuild
+
+docker build --tag "grafana/buildcontainer" .
+
+docker run -i -t \
+  -v /home/torkel/dev/go:/go \
+ --name gfbuild grafana/buildcontainer /bin/bash
diff --git a/docker/debtest/Dockerfile b/docker/debtest/Dockerfile
index 30c5f3d08c9..0d32380194c 100644
--- a/docker/debtest/Dockerfile
+++ b/docker/debtest/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:jessie
+FROM debian
 
 ADD *.deb /tmp/
 
diff --git a/docker/rpmtest/Dockerfile b/docker/rpmtest/Dockerfile
index 132d7667af1..363af6de3ca 100644
--- a/docker/rpmtest/Dockerfile
+++ b/docker/rpmtest/Dockerfile
@@ -1,6 +1,6 @@
-FROM centos:7
+FROM centos:6
 
 RUN yum install -y initscripts
 
-ADD *.rpm /tmp/
+ADD * /tmp/