-
Notifications
You must be signed in to change notification settings - Fork 4.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Vendor dependencies #1144
Merged
Merged
Vendor dependencies #1144
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,3 @@ | ||
dist/ | ||
vendor/ | ||
!dist/traefik | ||
site/ | ||
**/*.test | ||
/dist/ | ||
!/dist/traefik | ||
/site/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,13 @@ | ||
/dist | ||
gen.go | ||
/autogen/gen.go | ||
.idea | ||
.intellij | ||
*.iml | ||
traefik | ||
traefik.toml | ||
*.test | ||
vendor/ | ||
static/ | ||
/traefik | ||
/traefik.toml | ||
/static/ | ||
.vscode/ | ||
site/ | ||
/site/ | ||
*.log | ||
*.exe | ||
.DS_Store |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,18 @@ | ||
FROM golang:1.7 | ||
|
||
# Install a more recent version of mercurial to avoid mismatching results | ||
# between glide run on a decently updated host system and the build container. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Oh god 😢 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The golang builder is based on Debian jessie. 🙁 |
||
RUN awk '$1 ~ "^deb" { $3 = $3 "-backports"; print; exit }' /etc/apt/sources.list > /etc/apt/sources.list.d/backports.list && \ | ||
DEBIAN_FRONTEND=noninteractive apt-get update && \ | ||
DEBIAN_FRONTEND=noninteractive apt-get install -t jessie-backports --yes --no-install-recommends mercurial=3.9.1-1~bpo8+1 && \ | ||
rm -fr /var/lib/apt/lists/ | ||
|
||
RUN go get github.com/jteeuwen/go-bindata/... \ | ||
&& go get github.com/golang/lint/golint \ | ||
&& go get github.com/kisielk/errcheck \ | ||
&& go get github.com/client9/misspell/cmd/misspell \ | ||
&& go get github.com/mattfarina/glide-hash | ||
&& go get github.com/mattfarina/glide-hash \ | ||
&& go get github.com/sgotti/glide-vc | ||
|
||
# Which docker version to test on | ||
ARG DOCKER_VERSION=1.10.3 | ||
|
@@ -24,13 +32,4 @@ RUN mkdir -p /usr/local/bin \ | |
| tar -xzC /usr/local/bin --transform 's#^.+/##x' | ||
|
||
WORKDIR /go/src/github.com/containous/traefik | ||
|
||
COPY glide.yaml glide.yaml | ||
COPY glide.lock glide.lock | ||
RUN glide install -v | ||
|
||
COPY integration/glide.yaml integration/glide.yaml | ||
COPY integration/glide.lock integration/glide.lock | ||
RUN cd integration && glide install | ||
|
||
COPY . /go/src/github.com/containous/traefik |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we could now include generated files in git. This will allow to
go get
Traefik. WDYT? But that wan be done in another PR.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd love to get rid of the extra generator step. I haven't worked a lot with generated code, however, so no idea if checking that in is a good practice or not.
(I know the Kubernetes folks are trying hard to undo committing generated code, but that might be because they are playing in a different league.)
Either way, discussing / considering in a separate issue / PR sounds good. 👍