From a6a62a352a31b02ccadde0c45b72de395194f9e3 Mon Sep 17 00:00:00 2001 From: Maxime Simon Date: Sun, 12 Jul 2015 14:23:46 +0200 Subject: [PATCH 1/5] fix: missing `go get` entry in README. error on build --- README.md | 5 +++-- intools.types.go | 2 +- main.cli.app.go | 2 +- main.daemon.go | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 8f166cb..5db2d8e 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ ```` go get -u "github.com/codegangsta/cli" go get -u "github.com/gin-gonic/gin" +go get -u "github.com/robfig/cron" go get -u "github.com/samalba/dockerclient" go get -u "gopkg.in/redis.v3" ```` @@ -15,9 +16,9 @@ go get -u "gopkg.in/redis.v3" ## Global Options ```` --host, -H Docker host [$DOCKER_HOST] - --cert, -C Docker cert path [$DOCKER_CERT_PATH] + --cert, -C Docker cert path [$DOCKER_CERT_PATH] --redis "localhost:6379" Redis Host [$REDIS_HOST] --redis-password Redis Password [$REDIS_PWD] --redis-db "0" Redis Database [$REDIS_DB] - --debug Debug mode [$INTOOLS_DEBUG] + --debug Debug mode [$INTOOLS_DEBUG] ```` diff --git a/intools.types.go b/intools.types.go index cb1f6f6..2a5984e 100644 --- a/intools.types.go +++ b/intools.types.go @@ -9,7 +9,7 @@ import ( ) type IntoolsEngine struct { - DockerClient dockerclient.Client + DockerClient dockerclient.DockerClient DockerHost string RedisClient redis.Client Cron *cron.Cron diff --git a/main.cli.app.go b/main.cli.app.go index 2e29abf..bc2058e 100644 --- a/main.cli.app.go +++ b/main.cli.app.go @@ -75,7 +75,7 @@ func runAction(c *cli.Context) { cmd = cmd[4:] Debug.Println("Launching " + image + " " + strings.Join(cmd, " ")) - intoolsEngine := &IntoolsEngine{dockerClient, host, *redisClient, nil} + intoolsEngine := &IntoolsEngine{*dockerClient, host, *redisClient, nil} connector := intoolsEngine.NewConnector(group, conn) connector.Init(image, timeout, 0, cmd) executor, err := intoolsEngine.Exec(connector) diff --git a/main.daemon.go b/main.daemon.go index c6ada35..d512294 100644 --- a/main.daemon.go +++ b/main.daemon.go @@ -24,7 +24,7 @@ func newDaemon(port int, debug bool, dockerClient *dockerclient.DockerClient, do } engine := gin.Default() cron := cron.New() - intools := &IntoolsEngine{dockerClient, dockerHost, *redisClient, cron} + intools := &IntoolsEngine{*dockerClient, dockerHost, *redisClient, cron} daemon := &Daemon{port, engine, debug, intools} return daemon } From e438f8d1752ccb8d9caca3531512e75a35b9e514 Mon Sep 17 00:00:00 2001 From: Maxime Simon Date: Sun, 12 Jul 2015 14:28:41 +0200 Subject: [PATCH 2/5] config: add travis CI support --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..e8197a2 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,5 @@ +language: go + +go: + - 1.4 + - tip From 11dc4dd87514ba0e04de482d05bfbc0203a93a61 Mon Sep 17 00:00:00 2001 From: Maxime Simon Date: Sun, 12 Jul 2015 14:34:26 +0200 Subject: [PATCH 3/5] config: customize travis build steps --- .travis.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e8197a2..11c933a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,11 @@ language: go -go: - - 1.4 - - tip +go: tip + +install: + - go get -u "github.com/codegangsta/cli" + - go get -u "github.com/gin-gonic/gin" + - go get -u "github.com/robfig/cron" + - go get -u "github.com/samalba/dockerclient" + - go get -u "gopkg.in/redis.v3" + - go build . From eb76ec376ec7606d1ef0cfd7ee65f5bfa942943e Mon Sep 17 00:00:00 2001 From: Maxime Simon Date: Sun, 12 Jul 2015 14:37:42 +0200 Subject: [PATCH 4/5] config: travis, build go 1.4 --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 11c933a..05e3112 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ language: go -go: tip +go: + - 1.4 + - tip install: - go get -u "github.com/codegangsta/cli" From 07eeabc7be729e4e1ad61e84b01dfcdbc91a5922 Mon Sep 17 00:00:00 2001 From: Maxime Simon Date: Sun, 12 Jul 2015 22:28:34 +0200 Subject: [PATCH 5/5] fix: remarks from PR #1 --- .travis.yml | 12 +++--------- intools.types.go | 2 +- main.cli.app.go | 2 +- main.daemon.go | 2 +- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 05e3112..99c3090 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,7 @@ language: go -go: - - 1.4 - - tip +go: 1.4 install: - - go get -u "github.com/codegangsta/cli" - - go get -u "github.com/gin-gonic/gin" - - go get -u "github.com/robfig/cron" - - go get -u "github.com/samalba/dockerclient" - - go get -u "gopkg.in/redis.v3" - - go build . + - go get -d -v ./... + - go build -v ./... diff --git a/intools.types.go b/intools.types.go index 2ac5c81..e98e26b 100644 --- a/intools.types.go +++ b/intools.types.go @@ -9,7 +9,7 @@ import ( ) type IntoolsEngine struct { - DockerClient dockerclient.DockerClient + DockerClient *dockerclient.DockerClient DockerHost string RedisClient redis.Client Cron *cron.Cron diff --git a/main.cli.app.go b/main.cli.app.go index f46ef47..94d7c60 100644 --- a/main.cli.app.go +++ b/main.cli.app.go @@ -75,7 +75,7 @@ func runAction(c *cli.Context) { cmd = cmd[4:] Debug.Println("Launching " + image + " " + strings.Join(cmd, " ")) Warning.Printf("In command line, connector schedule is not available") - Intools = &IntoolsEngine{*dockerClient, host, *redisClient, nil} + Intools = &IntoolsEngine{dockerClient, host, *redisClient, nil} connector := Intools.NewConnector(group, conn) connector.Init(image, timeout, 0, cmd) Intools.InitSchedule(connector) diff --git a/main.daemon.go b/main.daemon.go index 8eb8ea0..ad00d29 100644 --- a/main.daemon.go +++ b/main.daemon.go @@ -23,7 +23,7 @@ func newDaemon(port int, debug bool, dockerClient *dockerclient.DockerClient, do } engine := gin.Default() cron := cron.New() - Intools = &IntoolsEngine{*dockerClient, dockerHost, *redisClient, cron} + Intools = &IntoolsEngine{dockerClient, dockerHost, *redisClient, cron} daemon := &Daemon{port, engine, debug} return daemon }