Skip to content
This repository has been archived by the owner on Jul 27, 2023. It is now read-only.

Fix bit rot in mesos-go API and Consul dependencies #113

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix bit rot in mesos-go API and Consul dependencies #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
648e00a
Use old mesos-go v0 API
gfv Apr 5, 2017
dfd45f9
Use newer Alpine 3.5 for Go 1.7 to build Consul dependencies
gfv Apr 5, 2017
12b5ab7
Work around an old kernel bug while building (cf. docker/docker#27214)
gfv Apr 5, 2017
4762f1c
Merge branch 'master' into master
thomasvincent Jun 7, 2017
6534b46
Merge branch 'master' into master
thomasvincent Jun 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

FROM golang:1.7.5-alpine3.5

MAINTAINER Chris Aubuchon <Chris.Aubuchon@gmail.com>
Expand All @@ -7,6 +8,7 @@ RUN apk add --update make git glide \
&& cd /go/src/github.com/CiscoCloud/mesos-consul \
&& make vendor \
&& go build -o /bin/mesos-consul \

&& rm -rf /go \
&& apk del --purge make git glide

Expand Down
6 changes: 3 additions & 3 deletions mesos/zk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"net"
"time"

"github.com/mesos/mesos-go/detector"
_ "github.com/mesos/mesos-go/detector/zoo"
proto "github.com/mesos/mesos-go/mesosproto"
"github.com/mesos/mesos-go/api/v0/detector"
_ "github.com/mesos/mesos-go/api/v0/detector/zoo"
proto "github.com/mesos/mesos-go/api/v0/mesosproto"
log "github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion state/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strconv"
"strings"

"github.com/mesos/mesos-go/upid"
"github.com/mesos/mesos-go/api/v0/upid"
)

// Resources holds resources as defined in the /state.json Mesos HTTP endpoint.
Expand Down
2 changes: 1 addition & 1 deletion state/state_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"reflect"
"testing"

"github.com/mesos/mesos-go/upid"
"github.com/mesos/mesos-go/api/v0/upid"
. "github.com/CiscoCloud/mesos-consul/state"
)

Expand Down