Merge remote-tracking branch 'upstream/0.4.0' into 0.4.0

This commit is contained in:
Brad Rydzewski 2015-06-06 14:01:41 -07:00
commit e81696b776
5 changed files with 54 additions and 9 deletions

View file

@ -4,8 +4,10 @@ git:
env: env:
- GOROOT=/usr/local/go - GOROOT=/usr/local/go
- PATH=$PATH:$GOROOT/bin:$GOPATH/bin - PATH=$PATH:$GOROOT/bin:$GOPATH/bin
script: script:
- git clone git://github.com/gin-gonic/gin.git $GOPATH/src/github.com/gin-gonic/gin - go get golang.org/x/tools/cmd/cover
- go get golang.org/x/tools/cmd/vet
- go get -u github.com/jteeuwen/go-bindata/... - go get -u github.com/jteeuwen/go-bindata/...
- make bindata deps - make bindata deps
- make build - make build

3
.gitignore vendored
View file

@ -18,9 +18,10 @@ drone
*.rice-box.go *.rice-box.go
*.db *.db
*.txt *.txt
*.toml
*.min.js *.min.js
*_bindata.go *_bindata.go
*.toml
!dist/drone/etc/drone/drone.toml
# generate binaries # generate binaries
cmd/drone-agent/drone-agent cmd/drone-agent/drone-agent

View file

@ -34,7 +34,7 @@ key = ""
addr = "unix:///var/run/docker.sock" addr = "unix:///var/run/docker.sock"
swarm = "" swarm = ""
[service] [remote]
kind = "github" kind = "github"
base = "https://github.com" base = "https://github.com"
orgs = [] orgs = []
@ -53,19 +53,24 @@ request_token = ""
secret = "" secret = ""
``` ```
Configuration settings can also be set by environment variables using the scheme `DRONE_<section>_<confkey>`, substituting the section title for `<section>` and the key for `<confkey>`, in all caps. For example: Configuration settings can also be set by environment variables using the scheme
`DRONE_<section>_<confkey>`, substituting the section title for `<section>` and
the key for `<confkey>`, in all caps. For example:
```shell ```shell
#!/bin/bash #!/bin/bash
# prepare environment for executing drone # prepare environment for executing drone
DRONE_REMOTE_BASE="https://github.com" # for [remote] section, 'base' setting
DRONE_DOCKER_ADDR="tcp://10.0.0.1:2375" # for [docker] section, 'addr' setting DRONE_DOCKER_ADDR="tcp://10.0.0.1:2375" # for [docker] section, 'addr' setting
DRONE_AUTH_CLIENT="0123456789abcdef0123AA" # for [auth] section, 'client' setting DRONE_AUTH_CLIENT="0123456789abcdef0123AA" # for [auth] section, 'client' setting
DRONE_AUTH_SECRET="<sha-1 hash secret>" # for [auth] section, 'secret' setting DRONE_AUTH_SECRET="<sha-1 hash secret>" # for [auth] section, 'secret' setting
DRONE_AUTH_ACCESSTOKEN="<url>" # for [auth] section, 'access_token' setting
exec ./drone -config=drone.toml exec ./drone -config=drone.toml
``` ```
_NOTE: Configuration settings from environment variables override values set in the TOML file._ _NOTE: Configuration settings from environment variables override values set in
the TOML file._
### From Source ### From Source
@ -85,7 +90,8 @@ bin/drone
bin/drone --debug # debug mode loads static content from filesystem bin/drone --debug # debug mode loads static content from filesystem
``` ```
**NOTE** if you are seeing slow compile times you can try running `go install` for the vendored `go-sqlite3` library: **NOTE** if you are seeing slow compile times you can try running `go install`
for the vendored `go-sqlite3` library:
```sh ```sh
go install github.com/drone/drone/Godeps/_workspace/src/github.com/mattn/go-sqlite3 go install github.com/drone/drone/Godeps/_workspace/src/github.com/mattn/go-sqlite3

36
dist/drone/etc/drone/drone.toml vendored Normal file
View file

@ -0,0 +1,36 @@
[server]
addr = ":80"
cert = ""
key = ""
# [session]
# secret = ""
# expires = ""
[database]
path = "/var/lib/drone/drone.sqlite"
[docker]
cert = ""
key = ""
addr = "unix:///var/run/docker.sock"
swarm = ""
# [service]
# kind = "github"
# base = "https://github.com"
# orgs = []
# open = false
# private = false
# skip_verify = true
# [auth]
# client = ""
# secret = ""
# authorize = "https://github.com/login/oauth/authorize"
# access_token = "https://github.com/login/oauth/access_token"
# request_token = ""
# [agents]
# secret = ""