Merge pull request #39 from bobrik/dep

Migrate to dep for dependency management
bobrik · Aug 29, 2017 · 126d618 · 126d618
2 parents 528dbe5 + 16c2e02
commit 126d618
Show file tree

Hide file tree

Showing 94 changed files with 10,130 additions and 1,017 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,8 @@
 language: go
 
 go:
-  - 1.6
-  - tip
+  - 1.x
+  - master
 
 before_script:
   - go install ./...

diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,9 @@
-FROM alpine:3.3
+FROM alpine:3.6
 
 COPY . /go/src/github.com/bobrik/zoidberg
 
-RUN apk --update add go ca-certificates && \
-    export GOPATH=/go GO15VENDOREXPERIMENT=1 && \
-    go get github.com/bobrik/zoidberg/... && \
-    apk del go
+RUN apk --update add go libc-dev ca-certificates && \
+    GOPATH=/go go install -v github.com/bobrik/zoidberg/cmd/... && \
+    apk del go libc-dev
 
 ENTRYPOINT ["/go/bin/zoidberg"]
diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -1,10 +1,9 @@
-FROM alpine:3.3
+FROM alpine:3.6
 
-RUN apk --update add go ca-certificates
+RUN apk --update add go libc-dev ca-certificates
 
 COPY . /go/src/github.com/bobrik/zoidberg
 
-RUN export GOPATH=/go GO15VENDOREXPERIMENT=1 && \
-    go get github.com/bobrik/zoidberg/...
+RUN GOPATH=/go go install -v github.com/bobrik/zoidberg/cmd/... && \
 
 ENTRYPOINT ["/go/bin/zoidberg"]
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/Readme b/Godeps/Readme
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -0,0 +1,30 @@
+
+# Gopkg.toml example
+#
+# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#  name = "github.com/x/y"
+#  version = "2.4.0"
+
+
+[[constraint]]
+  name = "github.com/gambol99/go-marathon"
+  version = "0.7.1"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/samuel/go-zookeeper"
diff --git a/application/marathon.go b/application/marathon.go
@@ -60,7 +60,7 @@ func (m *MarathonFinder) Apps() (Apps, error) {
 	apps := map[string]App{}
 
 	for _, a := range ma {
-		for port, labels := range extractApps(a.Labels) {
+		for port, labels := range extractApps(*a.Labels) {
 			if m.balancer != labels["balanced_by"] {
 				continue
 			}

diff --git a/vendor/github.com/donovanhide/eventsource/codec_test.go b/vendor/github.com/donovanhide/eventsource/codec_test.go
diff --git a/vendor/github.com/donovanhide/eventsource/decoder.go b/vendor/github.com/donovanhide/eventsource/decoder.go
diff --git a/vendor/github.com/donovanhide/eventsource/decoder_test.go b/vendor/github.com/donovanhide/eventsource/decoder_test.go
diff --git a/vendor/github.com/donovanhide/eventsource/example_error_handling_stream_test.go b/vendor/github.com/donovanhide/eventsource/example_error_handling_stream_test.go
diff --git a/vendor/github.com/donovanhide/eventsource/example_event_test.go b/vendor/github.com/donovanhide/eventsource/example_event_test.go