Skip to content

Commit

Permalink
replace glide with godep
Browse files Browse the repository at this point in the history
  • Loading branch information
bcicen committed Sep 3, 2017
1 parent 92ca9bf commit f6595a0
Show file tree
Hide file tree
Showing 6 changed files with 210 additions and 151 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM quay.io/vektorcloud/go:1.8
FROM quay.io/vektorcloud/go:1.9

RUN apk add --no-cache make

COPY glide.* /go/src/github.com/bcicen/ctop/
COPY Gopkg.* /go/src/github.com/bcicen/ctop/
WORKDIR /go/src/github.com/bcicen/ctop/
RUN glide install
RUN dep ensure -vendor-only

COPY . /go/src/github.com/bcicen/ctop
RUN make build && \
Expand Down
159 changes: 159 additions & 0 deletions Gopkg.lock

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

47 changes: 47 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@

# 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/fsouza/go-dockerclient"
revision = "318513eb1ab27495afbc67f671ba1080513d8aa0"

[[constraint]]
branch = "barchart-numfmt"
name = "github.com/gizak/termui"
source = "https://github.com/bcicen/termui"

[[constraint]]
branch = "master"
name = "github.com/jgautheron/codename-generator"

[[constraint]]
branch = "master"
name = "github.com/nu7hatch/gouuid"

[[constraint]]
name = "github.com/op/go-logging"
version = "1.0.0"

[[constraint]]
name = "github.com/opencontainers/runc"
version = "0.1.1"
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ clean:
rm -rf _build/ release/

build:
glide install
dep ensure
CGO_ENABLED=0 go build -tags release -ldflags $(LD_FLAGS) -o ctop

build-dev:
Expand Down
129 changes: 0 additions & 129 deletions glide.lock

This file was deleted.

18 changes: 0 additions & 18 deletions glide.yaml

This file was deleted.

0 comments on commit f6595a0

Please sign in to comment.