Skip to content

vendor: add missing deps and remove go get in .travis.yml#415

Merged
crosbymichael merged 1 commit intocontainerd:masterfrom
AkihiroSuda:update-vendor
Jan 12, 2017
Merged

vendor: add missing deps and remove go get in .travis.yml#415
crosbymichael merged 1 commit intocontainerd:masterfrom
AkihiroSuda:update-vendor

Conversation

@AkihiroSuda
Copy link
Member

Signed-off-by: Akihiro Suda suda.akihiro@lab.ntt.co.jp

@samuelkarp
Copy link
Member

It might be worth removing the go get lines from .travis.yml so that the Travis run will use only the vendored dependencies.

@AkihiroSuda AkihiroSuda changed the title vendor: add missing deps vendor: add missing deps and remove go get in .travis.yml Jan 12, 2017
@AkihiroSuda
Copy link
Member Author

Yes, I was also thinking of that. Updated PR.

Copy link
Member

@samuelkarp samuelkarp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
github.com/opencontainers/runtime-spec v1.0.0-rc3
# logrus, latest release as of 12/16/2016
# FIXME: github.com/docker/docker/pkg/archive requires this pkg as github.com/Sirupsen/logrus.
# So we vendor github.com/Sirupsen as well.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll open another PR to fix this FIXME later

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@crosbymichael opened containerd/go-runc#5, which replaces sirupsen with Sirupsen.

Another idea is to replace Sirupsen with sirupsen, but it would require modifying many files in github.com/docker/docker

So I suggest replacing sirupsen with Sirupsen.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's better to update docker/docker, the name is never going back to have a capital S.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree that we must get all vendored-in content to the new name. However, just to frame that it may not be exceedingly quick to do so [although the problem here in this project may be limited to a few pkg/* files?]:

193 files in docker/docker need the capitalization change.. fairly easy PR to create, and I'm willing to do so over there.

But, the following vendors (at least at the version imported to docker/docker today) also are using capital-S Sirupsen:

docker/distribution
docker/go-connections
docker/go-events
docker/libnetwork
docker/notary
docker/swarmkit
opencontainer/runc
Microsoft/hcsshim
Azure/go-ansiterm

So, each of those also need a PR merged and then a re-vendor (or just a re-vendor in case the master of those projects has fixed this since the last vendor update to docker/docker).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at https://github.com/docker/containerd/issues/376#issuecomment-267718697 , probably requirement for pkg/archive will be removed (in Phase 2 or 3?). Then this sirupsen-Sirupsen issue will be solved without changes for docker/docker.

@estesp
Copy link
Member

estesp commented Jan 12, 2017

Thanks @AkihiroSuda for catching the missing vendors; I think the Sirupsen change is the best we can do until all dependencies fix their imports to the new lowercase sirupsen.

@crosbymichael
Copy link
Member

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants