mirror of
https://github.com/grafana/grafana.git
synced 2024-11-22 08:56:43 -06:00
Working on trying to get CI builds on centos6 to solve GLIBC issue, #1568
This commit is contained in:
parent
4cbcee7e15
commit
cc89bc02f4
3
build.go
3
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
circle.yml
Normal file
6
circle.yml
Normal file
@ -0,0 +1,6 @@
|
||||
machine:
|
||||
services:
|
||||
- docker
|
||||
|
||||
test:
|
||||
- go test -v ./pkg/...
|
20
docker/buildcontainer/Dockerfile
Normal file
20
docker/buildcontainer/Dockerfile
Normal file
@ -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
docker/buildcontainer/build.sh
Executable file
10
docker/buildcontainer/build.sh
Executable file
@ -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,4 +1,4 @@
|
||||
FROM debian:jessie
|
||||
FROM debian
|
||||
|
||||
ADD *.deb /tmp/
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
FROM centos:7
|
||||
FROM centos:6
|
||||
|
||||
RUN yum install -y initscripts
|
||||
|
||||
ADD *.rpm /tmp/
|
||||
ADD * /tmp/
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user