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

Add top-level make vendor and run it. #148

Merged
merged 2 commits into from
Aug 2, 2017

Conversation

tiborvass
Copy link
Contributor

@tiborvass tiborvass commented Jul 27, 2017

This adds a vendor Makefile target to ensure cli's vendor is in sync with engine.

Assumes the docker-cli-dev docker image is built first:

$ make -C components/cli -f docker.Makefile dev

Then sync the vendor by running vendor target:

$ make vendor

Closes #116

Tibor Vass added 2 commits July 27, 2017 01:03
Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
@andrewhsu
Copy link
Contributor

Before this is merged, I'd like to compare the diff of changes in this PR with the analysis that @thaJeztah performed in #116 to see if we are missing out more vendor stuff or if it is the same.

@@ -29,8 +29,9 @@ func isremount(device string, flags uintptr) bool {

func mount(device, target, mType string, flags uintptr, data string) error {
oflags := flags &^ ptypes
if !isremount(device, flags) {
// Initial call applying all non-propagation flags.
if !isremount(device, flags) || data != "" {
Copy link
Contributor

Choose a reason for hiding this comment

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

this change is a result of not having #121 also vendor the changes to the components/engine dir

@@ -44,15 +44,23 @@ type Volume struct {
UsageData *VolumeUsageData `json:"UsageData,omitempty"`
}

// VolumeUsageData volume usage data
// VolumeUsageData Usage details about the volume. This information is used by the
Copy link
Contributor

Choose a reason for hiding this comment

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

this change is a result of not having #132 also vendor the changes to the components/engine dir

Copy link
Contributor

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

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

LGTM

I've verified this PR contains all of the components/cli/vendor/github.com/docker/docker changes that was in #116 and also caught 2 more missing changes that should have been in there.

@andrewhsu andrewhsu merged commit 1282b94 into docker-archive:17.06 Aug 2, 2017
docker-jenkins pushed a commit that referenced this pull request Aug 21, 2018
Set up default product license for community engines
Upstream-commit: 7195f21
Component: packaging
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 29, 2020
Add top-level `make vendor` and run it.
akrasnov-drv pushed a commit to drivenets/docker-ce that referenced this pull request Apr 23, 2023
Set up default product license for community engines
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants