Procházet zdrojové kódy

Working on trying to get CI builds on centos6 to solve GLIBC issue, #1568

Torkel Ödegaard před 10 roky
rodič
revize
cc89bc02f4

+ 1 - 2
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/...")

+ 6 - 0
circle.yml

@@ -0,0 +1,6 @@
+machine:
+  services:
+    - docker
+
+test:
+  - go test -v ./pkg/...

+ 20 - 0
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
+
+

+ 10 - 0
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

+ 1 - 1
docker/debtest/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:jessie
+FROM debian
 
 ADD *.deb /tmp/
 

+ 2 - 2
docker/rpmtest/Dockerfile

@@ -1,6 +1,6 @@
-FROM centos:7
+FROM centos:6
 
 RUN yum install -y initscripts
 
-ADD *.rpm /tmp/
+ADD * /tmp/