Skip to content

Commit

Permalink
Migrating from GoDep to dep
Browse files Browse the repository at this point in the history
  • Loading branch information
WillGunther committed Mar 30, 2018
1 parent 83fecd2 commit bbbe7a4
Show file tree
Hide file tree
Showing 6 changed files with 226 additions and 144 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,6 @@ OPATH
ehthumbs.db
Thumbs.db
vendor

# The binary
trickster
137 changes: 0 additions & 137 deletions Godeps/Godeps.json

This file was deleted.

5 changes: 0 additions & 5 deletions Godeps/Readme

This file was deleted.

147 changes: 147 additions & 0 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

74 changes: 74 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
# 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"
#
# [prune]
# non-go = false
# go-tests = true
# unused-packages = true


[[constraint]]
name = "github.com/BurntSushi/toml"
version = "0.3.0"

[[constraint]]
name = "github.com/go-kit/kit"
version = "0.7.0"

[[constraint]]
name = "github.com/go-redis/redis"
version = "6.10.2"

[[constraint]]
name = "github.com/go-stack/stack"
version = "1.7.0"

[[constraint]]
branch = "master"
name = "github.com/golang/snappy"

[[constraint]]
name = "github.com/gorilla/handlers"
version = "1.3.0"

[[constraint]]
name = "github.com/gorilla/mux"
version = "1.6.1"

[[constraint]]
name = "github.com/prometheus/client_golang"
version = "0.8.0"

[[constraint]]
branch = "master"
name = "github.com/prometheus/common"

[[constraint]]
branch = "master"
name = "golang.org/x/sys"

[[constraint]]
name = "gopkg.in/natefinch/lumberjack.v2"
version = "2.1.0"

[prune]
go-tests = true
unused-packages = true
4 changes: 2 additions & 2 deletions deploy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ FROM golang:1.9.3 as builder
COPY . /go/src/github.com/comcast/trickster
WORKDIR /go/src/github.com/comcast/trickster

RUN go get github.com/tools/godep
RUN godep restore
RUN curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
RUN dep ensure
RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -a -installsuffix cgo -o trickster -v github.com/comcast/trickster


Expand Down

0 comments on commit bbbe7a4

Please sign in to comment.