Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit 1282b94

Browse files
andrewhsuandrewhsu
authored
Merge pull request #148 from tiborvass/fix-vendor
Add top-level `make vendor` and run it.
2 parents 7ddc25c + ea04a0d commit 1282b94

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+125
-15307
lines changed

‎Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,6 @@ clean: ## clean the build artifacts
2525
-$(MAKE) -C $(CLI_DIR) clean
2626
-$(MAKE) -C $(ENGINE_DIR) clean
2727
-$(MAKE) -C $(PACKAGING_DIR) clean
28+
29+
vendor: $(CLI_DIR)/build/docker
30+
docker run --rm -it -v $(CLI_DIR):/go/src/github.com/docker/cli -v $(ENGINE_DIR):/go/src/github.com/docker/docker docker-cli-dev sh -c 'cd /go/src/github.com/docker/docker && git init && git add . && git -c user.name=user -c user.email=email@example.com commit -m first && cd /go/src/github.com/docker/cli && vndr; rm -rf /go/src/github.com/docker/docker/.git'

‎components/cli/vendor.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ github.com/coreos/etcd 824277cb3a577a0e8c829ca9ec557b973fe06d20
77
github.com/cpuguy83/go-md2man a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa
88
github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76
99
github.com/docker/distribution b38e5838b7b2f2ad48e06ec4b500011976080621
10-
# github.com/docker/docker 45c6f4262a865a03adaac291a9ce33c0f2190d77
10+
github.com/docker/docker master ../docker
1111
github.com/docker/docker-credential-helpers v0.5.0
1212
github.com/docker/go d30aec9fd63c35133f8f79c3412ad91a3b08be06
1313
github.com/docker/go-connections e15c02316c12de00874640cd76311849de2aeed5

‎components/cli/vendor/github.com/docker/docker/api/types/swarm/task.go‎

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/cli/vendor/github.com/docker/docker/api/types/types.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/cli/vendor/github.com/docker/docker/api/types/volume.go‎

Lines changed: 11 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/cli/vendor/github.com/docker/docker/opts/config.go‎

Lines changed: 0 additions & 98 deletions
This file was deleted.

‎components/cli/vendor/github.com/docker/docker/opts/opts.go‎

Lines changed: 0 additions & 161 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)