-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Conversation
Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
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 != "" { |
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.
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 |
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.
this change is a result of not having #132 also vendor the changes to the components/engine
dir
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.
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.
Set up default product license for community engines Upstream-commit: 7195f21 Component: packaging
Add top-level `make vendor` and run it.
Set up default product license for community engines
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:Then sync the vendor by running
vendor
target:Closes #116