From 402bc4e00a1f55751e497e3259e31e73568ea494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathias=20=C3=85hsberg?= Date: Thu, 4 Jun 2015 18:51:27 +0200 Subject: [PATCH 01/13] Adds newline at end of file --- dist/drone/DEBIAN/conffiles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/drone/DEBIAN/conffiles b/dist/drone/DEBIAN/conffiles index fd633dbd2..980d34ea0 100644 --- a/dist/drone/DEBIAN/conffiles +++ b/dist/drone/DEBIAN/conffiles @@ -1,2 +1,2 @@ /etc/init/drone.conf -/etc/drone/drone.toml \ No newline at end of file +/etc/drone/drone.toml From 53eb20f5b9b0f03a982737dd8aaf28f0cce41e0a Mon Sep 17 00:00:00 2001 From: Brad Rydzewski Date: Thu, 4 Jun 2015 11:54:39 -0700 Subject: [PATCH 02/13] Update .drone.yml --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index d6bd26949..822227146 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,6 +5,7 @@ env: - GOROOT=/usr/local/go - PATH=$PATH:$GOROOT/bin:$GOPATH/bin script: + - apt-get update && apt-get -y install dpkg - git clone git://github.com/gin-gonic/gin.git $GOPATH/src/github.com/gin-gonic/gin - go get -u github.com/jteeuwen/go-bindata/... - make bindata deps @@ -42,4 +43,4 @@ build: - go get -u github.com/jteeuwen/go-bindata/... - make bindata deps - make build - - make test \ No newline at end of file + - make test From ba4e6b0978a7fd62084c6ec4fa041b8cc5b60325 Mon Sep 17 00:00:00 2001 From: Brad Rydzewski Date: Thu, 4 Jun 2015 11:55:56 -0700 Subject: [PATCH 03/13] upgrade dpkg in 0.4 branch --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 822227146..924d64c1a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,7 +5,7 @@ env: - GOROOT=/usr/local/go - PATH=$PATH:$GOROOT/bin:$GOPATH/bin script: - - apt-get update && apt-get -y install dpkg + - sudo apt-get update && sudo apt-get -y install dpkg - git clone git://github.com/gin-gonic/gin.git $GOPATH/src/github.com/gin-gonic/gin - go get -u github.com/jteeuwen/go-bindata/... - make bindata deps From 5f29e94b08f0a7fde06514cf27d20a48421d5761 Mon Sep 17 00:00:00 2001 From: Brad Rydzewski Date: Thu, 4 Jun 2015 12:01:12 -0700 Subject: [PATCH 04/13] Update .drone.yml --- .drone.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index 924d64c1a..1949235de 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,12 +1,9 @@ -image: go1.3 +image: library/golang:1.4.2 git: path: github.com/drone/drone -env: - - GOROOT=/usr/local/go - - PATH=$PATH:$GOROOT/bin:$GOPATH/bin script: - - sudo apt-get update && sudo apt-get -y install dpkg - - git clone git://github.com/gin-gonic/gin.git $GOPATH/src/github.com/gin-gonic/gin + - export /var/cache/drone=/drone + - export PATH=$PATH:$GOPATH/bin - go get -u github.com/jteeuwen/go-bindata/... - make bindata deps - make build From 9d0d81fa977d48fc61ce6ca4f4ad28b20c462870 Mon Sep 17 00:00:00 2001 From: Brad Rydzewski Date: Thu, 4 Jun 2015 12:03:13 -0700 Subject: [PATCH 05/13] fixed gopath issue in yaml --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 1949235de..b27f90502 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,7 +2,7 @@ image: library/golang:1.4.2 git: path: github.com/drone/drone script: - - export /var/cache/drone=/drone + - export GOPATH=/var/cache/drone - export PATH=$PATH:$GOPATH/bin - go get -u github.com/jteeuwen/go-bindata/... - make bindata deps From 7f57c4f960a9ce495914a6b334c99dab3a3a261a Mon Sep 17 00:00:00 2001 From: Brad Rydzewski Date: Thu, 4 Jun 2015 12:04:44 -0700 Subject: [PATCH 06/13] Update .drone.yml --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index b27f90502..ca7d6c801 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,6 +4,7 @@ git: script: - export GOPATH=/var/cache/drone - export PATH=$PATH:$GOPATH/bin + - go get golang.org/x/tools/cmd/vet - go get -u github.com/jteeuwen/go-bindata/... - make bindata deps - make build From 2dbd77092308292d454126b80909bb57bbe0e3f2 Mon Sep 17 00:00:00 2001 From: Brad Rydzewski Date: Thu, 4 Jun 2015 12:06:20 -0700 Subject: [PATCH 07/13] go get the `go cover` tool --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index ca7d6c801..84a240b77 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,6 +4,7 @@ git: script: - export GOPATH=/var/cache/drone - export PATH=$PATH:$GOPATH/bin + - go get golang.org/x/tools/cmd/cover - go get golang.org/x/tools/cmd/vet - go get -u github.com/jteeuwen/go-bindata/... - make bindata deps From fbaaed296840131ee18af34254e9db7fa0f17d4a Mon Sep 17 00:00:00 2001 From: Brad Rydzewski Date: Thu, 4 Jun 2015 12:08:29 -0700 Subject: [PATCH 08/13] upgrade dpkg in yaml --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 84a240b77..8358d872c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,6 +11,7 @@ script: - make build - make test - make dist + - apt-get update && apt-get -y install dpkg notify: email: From e4b7f86054529fecf358759d1036917dbe333ae5 Mon Sep 17 00:00:00 2001 From: Brad Rydzewski Date: Thu, 4 Jun 2015 12:59:23 -0700 Subject: [PATCH 09/13] try wheezy for build environment --- .drone.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8358d872c..512e26235 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,4 +1,4 @@ -image: library/golang:1.4.2 +image: library/golang:1.4.2-wheezy git: path: github.com/drone/drone script: @@ -11,7 +11,6 @@ script: - make build - make test - make dist - - apt-get update && apt-get -y install dpkg notify: email: From 081f0efa0bff37079a12b52ea6f8bca952f0eb40 Mon Sep 17 00:00:00 2001 From: Brad Rydzewski Date: Thu, 4 Jun 2015 13:31:48 -0700 Subject: [PATCH 10/13] dumb mistake excluded toml in deb --- .gitignore | 3 ++- dist/drone/etc/drone/drone.toml | 36 +++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 dist/drone/etc/drone/drone.toml diff --git a/.gitignore b/.gitignore index 19d536fa7..764493cf2 100644 --- a/.gitignore +++ b/.gitignore @@ -18,9 +18,10 @@ drone *.rice-box.go *.db *.txt -*.toml *.min.js *_bindata.go +*.toml +!dist/drone/etc/drone/drone.toml # generate binaries cmd/drone-agent/drone-agent diff --git a/dist/drone/etc/drone/drone.toml b/dist/drone/etc/drone/drone.toml new file mode 100644 index 000000000..4fb4f0c00 --- /dev/null +++ b/dist/drone/etc/drone/drone.toml @@ -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 = "" + From 95ab7a49e64dac86a2b63010c19304a4dce2dd22 Mon Sep 17 00:00:00 2001 From: Brad Rydzewski Date: Thu, 4 Jun 2015 13:32:41 -0700 Subject: [PATCH 11/13] revert drone.yml to stable debian --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 512e26235..84a240b77 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,4 +1,4 @@ -image: library/golang:1.4.2-wheezy +image: library/golang:1.4.2 git: path: github.com/drone/drone script: From 03f91ee5a42dab965d56c738c542b6e6d91f0d6d Mon Sep 17 00:00:00 2001 From: Brad Rydzewski Date: Thu, 4 Jun 2015 13:39:16 -0700 Subject: [PATCH 12/13] use drone's go:1.3 image until we upgrade to 0.4 --- .drone.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 84a240b77..7288afad4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,9 +1,11 @@ -image: library/golang:1.4.2 +image: go1.3 git: path: github.com/drone/drone +env: + - GOROOT=/usr/local/go + - PATH=$PATH:$GOROOT/bin:$GOPATH/bin + script: - - export GOPATH=/var/cache/drone - - export PATH=$PATH:$GOPATH/bin - go get golang.org/x/tools/cmd/cover - go get golang.org/x/tools/cmd/vet - go get -u github.com/jteeuwen/go-bindata/... From 2f4e2803e7cdfd15dacd6157d194ee70ac3ac1b6 Mon Sep 17 00:00:00 2001 From: Jean Mertz Date: Sat, 6 Jun 2015 01:57:30 +0200 Subject: [PATCH 13/13] update README to mention remote section Also adds example of `access_token` becoming `ACCESSTOKEN` as an environment variable. --- README.md | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 0860d46d2..3d398581d 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ key = "" addr = "unix:///var/run/docker.sock" swarm = "" -[service] +[remote] kind = "github" base = "https://github.com" orgs = [] @@ -53,19 +53,24 @@ request_token = "" secret = "" ``` -Configuration settings can also be set by environment variables using the scheme `DRONE_
_`, substituting the section title for `
` and the key for ``, in all caps. For example: +Configuration settings can also be set by environment variables using the scheme +`DRONE_
_`, substituting the section title for `
` and +the key for ``, in all caps. For example: ```shell #!/bin/bash # 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_AUTH_CLIENT="0123456789abcdef0123AA" # for [auth] section, 'client' setting DRONE_AUTH_SECRET="" # for [auth] section, 'secret' setting +DRONE_AUTH_ACCESSTOKEN="" # for [auth] section, 'access_token' setting 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 @@ -85,8 +90,9 @@ bin/drone 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 go install github.com/drone/drone/Godeps/_workspace/src/github.com/mattn/go-sqlite3 -``` \ No newline at end of file +```