Skip to content

Commit

Permalink
switch from glide to dep
Browse files Browse the repository at this point in the history
  • Loading branch information
dennwc committed Apr 14, 2018
1 parent a6bad2e commit 4c75257
Show file tree
Hide file tree
Showing 7 changed files with 462 additions and 253 deletions.
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ go:
install:
# Install our tracked dependencies
- go get -t ./...
- curl -L https://github.com/Masterminds/glide/releases/download/v0.12.3/glide-v0.12.3-linux-amd64.tar.gz -o /tmp/glide.tar.gz
- mkdir ../glide && cd ../glide && tar -xzf /tmp/glide.tar.gz && export PATH=$PATH:$PWD/linux-amd64/ && cd ../cayley
- glide install
- mkdir ../dep && curl -L https://github.com/golang/dep/releases/download/v0.4.1/dep-linux-amd64 -o ../dep/dep && chmod +x ../dep/dep && export PATH=$PATH:$PWD/../dep/
- dep ensure --vendor-only

# Google App Engine dependencies
# - cd ..
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ FROM golang:1.9 as builder
WORKDIR /go/src/github.com/cayleygraph/cayley

# Restore vendored dependencies
RUN sh -c "curl https://glide.sh/get | sh"
COPY glide.* ./
RUN glide install
RUN curl https://github.com/golang/dep/releases/download/v0.4.1/dep-linux-amd64 -o /usr/local/bin/dep && \
chmod +x /usr/local/bin/dep
RUN dep ensure --vendor-only

# This will be used to init cayley and as config file in the final image.
# Make sure you start every path with %PREFIX% to make it available in both
Expand Down
Loading

0 comments on commit 4c75257

Please sign in to comment.