Skip to content

Commit d8e8f43

Browse files
committed
use go modules
1 parent 1ca11ad commit d8e8f43

File tree

7 files changed

+103
-243
lines changed

7 files changed

+103
-243
lines changed

.travis.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1-
dist: trusty
2-
sudo: required
1+
dist: xenial
32
language: go
3+
go: "1.12.x"
4+
env:
5+
- GO111MODULE=on
6+
cache:
7+
directories:
8+
- $GOPATH/pkg/mod
9+
- $HOME/.cache/go-build
410
services:
511
- mysql
612
- rabbitmq
7-
before_install:
8-
- go get github.com/golang/dep/cmd/dep
9-
install:
10-
- dep ensure
13+
install: true
1114
before_script:
1215
- go build -ldflags="-X main.Version=$TRAVIS_TAG"
1316
- curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.15.0

Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
FROM golang:1.9.2 AS builder
2-
RUN go get github.com/golang/dep/cmd/dep
1+
FROM golang:1.12.2 AS builder
32
WORKDIR /go/src/github.com/putdotio/efes/
4-
ADD Gopkg.toml Gopkg.lock /go/src/github.com/putdotio/efes/
5-
RUN dep ensure -vendor-only
6-
ADD *.go /go/src/github.com/putdotio/efes/
3+
ENV GO111MODULE=on
4+
COPY go.mod .
5+
COPY go.sum .
6+
RUN go mod download
7+
COPY . .
78
RUN CGO_ENABLED=0 go install .
89

910
FROM ubuntu:xenial

Dockerfile-test

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
FROM golang:1.9.2 AS builder
2-
WORKDIR /go/src/github.com/putdotio/efes/
3-
RUN go get github.com/golang/dep/cmd/dep
4-
ADD Gopkg.toml Gopkg.lock /go/src/github.com/putdotio/efes/
5-
RUN dep ensure -vendor-only
1+
FROM golang:1.12.2 AS builder
62
RUN apt-get update && apt-get install -y mysql-client
3+
WORKDIR /go/src/github.com/putdotio/efes/
4+
ENV GO111MODULE=on
5+
COPY go.mod .
6+
COPY go.sum .
7+
RUN go mod download
78
ADD docker-run-tests.sh /root/run-tests.sh
8-
ADD *.go /go/src/github.com/putdotio/efes/
9+
COPY . .
910
ADD config-docker.toml /etc/efes.toml
1011
ENTRYPOINT ["/bin/bash", "/root/run-tests.sh"]

Gopkg.lock

Lines changed: 0 additions & 175 deletions
This file was deleted.

Gopkg.toml

Lines changed: 0 additions & 51 deletions
This file was deleted.

go.mod

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
module github.com/putdotio/efes
2+
3+
go 1.12
4+
5+
require (
6+
bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898
7+
github.com/BurntSushi/toml v0.0.0-20170626110600-a368813c5e64
8+
github.com/StackExchange/wmi v0.0.0-20170410192909-ea383cf3ba6e // indirect
9+
github.com/cenkalti/backoff v2.0.0+incompatible
10+
github.com/cenkalti/log v0.0.0-20160701141658-958ee7afc008
11+
github.com/cenkalti/redialer v0.0.0-20161130144139-a6cc66445f92
12+
github.com/certifi/gocertifi v0.0.0-20171105132559-a4ab0227d360 // indirect
13+
github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4
14+
github.com/fatih/color v1.6.0
15+
github.com/getsentry/raven-go v0.0.0-20171206001108-32a13797442c
16+
github.com/go-ole/go-ole v1.2.0 // indirect
17+
github.com/go-sql-driver/mysql v0.0.0-20171204004326-9181e3a86a19
18+
github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce // indirect
19+
github.com/hashicorp/go-multierror v0.0.0-20171204182908-b7773ae21874 // indirect
20+
github.com/mattn/go-colorable v0.0.9 // indirect
21+
github.com/mattn/go-isatty v0.0.3 // indirect
22+
github.com/mattn/go-runewidth v0.0.2 // indirect
23+
github.com/olekukonko/tablewriter v0.0.0-20171203151007-65fec0d89a57
24+
github.com/pkg/errors v0.8.0 // indirect
25+
github.com/shirou/gopsutil v0.0.0-20171130135017-5c46042e0db5
26+
github.com/streadway/amqp v0.0.0-20171101222333-ff791c2d22d3
27+
github.com/urfave/cli v0.0.0-20171203214237-119bb6564841
28+
golang.org/x/net v0.0.0-20171212005608-d866cfc389ce // indirect
29+
golang.org/x/sys v0.0.0-20171130163741-8b4580aae2a0 // indirect
30+
google.golang.org/appengine v1.0.0 // indirect
31+
)

go.sum

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898 h1:SC+c6A1qTFstO9qmB86mPV2IpYme/2ZoEQ0hrP+wo+Q=
2+
bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8=
3+
github.com/BurntSushi/toml v0.0.0-20170626110600-a368813c5e64 h1:BuYewlQyh/jroxY8qx41SrzD8Go17GkyCyAeVmprvQI=
4+
github.com/BurntSushi/toml v0.0.0-20170626110600-a368813c5e64/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
5+
github.com/StackExchange/wmi v0.0.0-20170410192909-ea383cf3ba6e h1:IHXQQIpxASe3m0Jtcd3XongL+lxHNd5nUmvHxJARUmg=
6+
github.com/StackExchange/wmi v0.0.0-20170410192909-ea383cf3ba6e/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
7+
github.com/cenkalti/backoff v2.0.0+incompatible h1:5IIPUHhlnUZbcHQsQou5k1Tn58nJkeJL9U+ig5CHJbY=
8+
github.com/cenkalti/backoff v2.0.0+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
9+
github.com/cenkalti/log v0.0.0-20160701141658-958ee7afc008 h1:tqwhrFvSXU98u7phhazyG9OAZb2iucvVkhymqUbXC3Q=
10+
github.com/cenkalti/log v0.0.0-20160701141658-958ee7afc008/go.mod h1:tZQKVjO9EM2I22rk9cNNoboHztmdUb2nLgScA/+0Iu4=
11+
github.com/cenkalti/redialer v0.0.0-20161130144139-a6cc66445f92 h1:7e+bEPZ989HAfQitGzQl6fdKh+Oy7Pqw76GUVy2UAys=
12+
github.com/cenkalti/redialer v0.0.0-20161130144139-a6cc66445f92/go.mod h1:nXu1jeCfhrGmwKC28vanvftPh/36SC9k2WSWRxQD/tI=
13+
github.com/certifi/gocertifi v0.0.0-20171105132559-a4ab0227d360 h1:mncIYTnditUQddapTftLSTGusm7hjdEWvKarvLlVi2M=
14+
github.com/certifi/gocertifi v0.0.0-20171105132559-a4ab0227d360/go.mod h1:GJKEexRPVJrBSOjoqN5VNOIKJ5Q3RViH6eu3puDRwx4=
15+
github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4 h1:qk/FSDDxo05wdJH28W+p5yivv7LuLYLRXPPD8KQCtZs=
16+
github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
17+
github.com/fatih/color v1.6.0 h1:66qjqZk8kalYAvDRtM1AdAJQI0tj4Wrue3Eq3B3pmFU=
18+
github.com/fatih/color v1.6.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
19+
github.com/getsentry/raven-go v0.0.0-20171206001108-32a13797442c h1:a4sdVBGTB8ko7YrWGLMmaCe8+eo4I9IyTNzSH8eGAW4=
20+
github.com/getsentry/raven-go v0.0.0-20171206001108-32a13797442c/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ=
21+
github.com/go-ole/go-ole v1.2.0 h1:wiiTJjbwlWm5KF3UgZHuU2a2ZKA8MXJaW4vnW0SOwg4=
22+
github.com/go-ole/go-ole v1.2.0/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8=
23+
github.com/go-sql-driver/mysql v0.0.0-20171204004326-9181e3a86a19 h1:0c+t6z4rBFEzGHSw3C+X3dovsmUWH0R+YloQsWyv8q0=
24+
github.com/go-sql-driver/mysql v0.0.0-20171204004326-9181e3a86a19/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
25+
github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce h1:prjrVgOk2Yg6w+PflHoszQNLTUh4kaByUcEWM/9uin4=
26+
github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
27+
github.com/hashicorp/go-multierror v0.0.0-20171204182908-b7773ae21874 h1:em+tTnzgU7N22woTBMcSJAOW7tRHAkK597W+MD/CpK8=
28+
github.com/hashicorp/go-multierror v0.0.0-20171204182908-b7773ae21874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I=
29+
github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4=
30+
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
31+
github.com/mattn/go-isatty v0.0.3 h1:ns/ykhmWi7G9O+8a448SecJU3nSMBXJfqQkl0upE1jI=
32+
github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
33+
github.com/mattn/go-runewidth v0.0.2 h1:UnlwIPBGaTZfPQ6T1IGzPI0EkYAQmT9fAEJ/poFC63o=
34+
github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
35+
github.com/olekukonko/tablewriter v0.0.0-20171203151007-65fec0d89a57 h1:c6g+iEoim6VD2DGy2utQoryQMVNndSvYm/YfGjc5A/o=
36+
github.com/olekukonko/tablewriter v0.0.0-20171203151007-65fec0d89a57/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
37+
github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
38+
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
39+
github.com/shirou/gopsutil v0.0.0-20171130135017-5c46042e0db5 h1:LclJu7tQPJ++RINb2K+D/dVlrDuL0KH4srPKXWF68EM=
40+
github.com/shirou/gopsutil v0.0.0-20171130135017-5c46042e0db5/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
41+
github.com/streadway/amqp v0.0.0-20171101222333-ff791c2d22d3 h1:qIyhhqB8VkGrFFxoFk3fWJavm55YQNFrf2qKr4cO7r4=
42+
github.com/streadway/amqp v0.0.0-20171101222333-ff791c2d22d3/go.mod h1:1WNBiOZtZQLpVAyu0iTduoJL9hEsMloAK5XWrtW0xdY=
43+
github.com/urfave/cli v0.0.0-20171203214237-119bb6564841 h1:jP7t6W929JwxPKa6Ck3efl4bWUZLQnI+sNmPot6ViIE=
44+
github.com/urfave/cli v0.0.0-20171203214237-119bb6564841/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
45+
golang.org/x/net v0.0.0-20171212005608-d866cfc389ce h1:4g3VPcb++AP2cNa6CQ0iACUoH7J/3Jxojq0mmJun9A4=
46+
golang.org/x/net v0.0.0-20171212005608-d866cfc389ce/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
47+
golang.org/x/sys v0.0.0-20171130163741-8b4580aae2a0 h1:x4M4WCms+ErQg/4VyECbP2kSNcDJ6nLwqEGov1QPtqk=
48+
golang.org/x/sys v0.0.0-20171130163741-8b4580aae2a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
49+
google.golang.org/appengine v1.0.0 h1:dN4LljjBKVChsv0XCSI+zbyzdqrkEwX5LQFUMRSGqOc=
50+
google.golang.org/appengine v1.0.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=

0 commit comments

Comments
 (0)