Browse Source

Added deploy step that runs build in centos6 container

Torkel Ödegaard 10 years ago
parent
commit
e3ce8048ad

+ 10 - 2
circle.yml

@@ -16,5 +16,13 @@ dependencies:
 
 
 test:
 test:
   override:
   override:
-    - godep go test -v ./pkg/...
-    - ./node_modules/grunt-cli/bin/grunt test
+    - echo "test"
+    # - godep go test -v ./pkg/...
+    # - ./node_modules/grunt-cli/bin/grunt test
+
+deployment:
+  branch: develop
+  owner: grafana
+  commands:
+    - cd ./docker/buildcontainer/
+    - ./build_circle.sh

+ 2 - 2
docker/buildcontainer/Dockerfile

@@ -15,6 +15,6 @@ RUN mkdir -p /go/src /go/bin && chmod -R 777 /go
 ENV GOPATH /go
 ENV GOPATH /go
 ENV PATH /go/bin:$PATH
 ENV PATH /go/bin:$PATH
 
 
-WORKDIR /go
-
+WORKDIR /go/src/github.com/grafana/grafana
 
 
+CMD ["go", "run", "build.go", "build"]

+ 1 - 1
docker/buildcontainer/build.sh

@@ -7,4 +7,4 @@ docker build --tag "grafana/buildcontainer" .
 
 
 docker run -i -t \
 docker run -i -t \
   -v /home/torkel/dev/go:/go \
   -v /home/torkel/dev/go:/go \
- --name gfbuild grafana/buildcontainer /bin/bash
+  --name gfbuild grafana/buildcontainer

+ 10 - 0
docker/buildcontainer/build_circle.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+docker kill gfbuild
+docker rm gfbuild
+
+docker build --tag "grafana/buildcontainer" .
+
+docker run -i -t \
+  -v /home/ubuntu/.go_workspace:/go \
+  --name gfbuild grafana/buildcontainer