Skip to content

Commit

Permalink
Switch from glide to golang/dep for vendoring
Browse files Browse the repository at this point in the history
  • Loading branch information
arekkas authored and arekkas committed Nov 1, 2017
1 parent 971d020 commit ec63fa4
Show file tree
Hide file tree
Showing 7 changed files with 461 additions and 256 deletions.
7 changes: 3 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,11 @@ jobs:
steps:
- checkout
- setup_remote_docker
- run: go get -u github.com/go-swagger/go-swagger/cmd/swagger github.com/bradfitz/goimports github.com/mattn/goveralls golang.org/x/tools/cmd/cover github.com/Masterminds/glide github.com/ory/go-acc
- run: go get -u github.com/go-swagger/go-swagger/cmd/swagger github.com/bradfitz/goimports github.com/mattn/goveralls golang.org/x/tools/cmd/cover github.com/ory/go-acc
- run: curl -L -s https://github.com/golang/dep/releases/download/v0.3.2/dep-linux-amd64 -o /go/bin/dep && chmod +x /go/bin/dep

# Installation
- run: glide install
- run: go install github.com/ory/oathkeeper
- run: glide update
- run: curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
- run: go install github.com/ory/oathkeeper

# Format
Expand Down
12 changes: 7 additions & 5 deletions Dockerfile-management
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
FROM golang:1.9-alpine

RUN apk add --no-cache git mercurial
RUN go get github.com/Masterminds/glide
RUN apk add --no-cache git build-base curl
RUN curl -L -s https://github.com/golang/dep/releases/download/v0.3.2/dep-linux-amd64 -o $GOPATH/bin/dep
RUN chmod +x $GOPATH/bin/dep

WORKDIR /go/src/github.com/ory/oathkeeper

ADD ./glide.lock ./glide.lock
ADD ./glide.yaml ./glide.yaml
RUN glide install
ADD ./Gopkg.lock ./Gopkg.lock
ADD ./Gopkg.toml ./Gopkg.toml
RUN dep ensure -vendor-only

ADD . .
RUN go install .
Expand Down
12 changes: 7 additions & 5 deletions Dockerfile-proxy
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
FROM golang:1.9-alpine

RUN apk add --no-cache git mercurial
RUN go get github.com/Masterminds/glide
RUN apk add --no-cache git build-base curl
RUN curl -L -s https://github.com/golang/dep/releases/download/v0.3.2/dep-linux-amd64 -o $GOPATH/bin/dep
RUN chmod +x $GOPATH/bin/dep

WORKDIR /go/src/github.com/ory/oathkeeper

ADD ./glide.lock ./glide.lock
ADD ./glide.yaml ./glide.yaml
RUN glide install
ADD ./Gopkg.lock ./Gopkg.lock
ADD ./Gopkg.toml ./Gopkg.toml
RUN dep ensure -vendor-only

ADD . .
RUN go install .
Expand Down
338 changes: 338 additions & 0 deletions Gopkg.lock

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

Loading

0 comments on commit ec63fa4

Please sign in to comment.