Skip to content

Add network create flags --scope, --config-only, --config-from#49

Merged
mavenugo merged 2 commits intodocker:masterfrom
aboch:nlo2
May 18, 2017
Merged

Add network create flags --scope, --config-only, --config-from#49
mavenugo merged 2 commits intodocker:masterfrom
aboch:nlo2

Conversation

@aboch
Copy link
Copy Markdown

@aboch aboch commented May 9, 2017

This is for moby/moby/pull/32981 and depends on the moby PR to be merged first.

@mavenugo mavenugo added this to the 17.06.0 milestone May 15, 2017
@thaJeztah
Copy link
Copy Markdown
Member

Looks like this needs a rebase 😢

@cpuguy83
Copy link
Copy Markdown
Collaborator

Let's keep this in design review until the API side is merged.

Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM, but can you squash 6535976 and 088518b ?

Comment thread cli/command/network/create.go Outdated
Labels: runconfigopts.ConvertKVStringsToMap(options.labels.GetAll()),
Scope: options.scope,
ConfigOnly: options.configOnly,
Labels: runconfigopts.ConvertKVStringsToMap(opts.labels.GetAll()),
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

shouldnt this be options.labels ?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

thanks, leftover form merge conflict

Comment thread cli/command/network/create.go Outdated
}

if from := options.configFrom; from != "" {
nc.ConfigFrom = network.ConfigReference{
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

&network.ConfigReference

- To promote a network to swarm mode

Signed-off-by: Alessandro Boch <[email protected]>
@aboch
Copy link
Copy Markdown
Author

aboch commented May 18, 2017

Thanks @thaJeztah @mavenugo Updated

Copy link
Copy Markdown
Contributor

@mavenugo mavenugo left a comment

Choose a reason for hiding this comment

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

LGTM

This will need a rebase after moby/moby#32981 is merged and vendor updated.

@nishanttotla
Copy link
Copy Markdown
Contributor

nishanttotla commented May 18, 2017

@aboch @mavenugo please include moby/moby#33239 in the vendor here, it should be merged soon (CI almost done)

@aboch
Copy link
Copy Markdown
Author

aboch commented May 18, 2017

@nishanttotla moby/moby#33239 is not changing any docker pkg exported function.
Even after it is being merged, I am not sure any of those changes would be imported from a vendoring to here.

@nishanttotla
Copy link
Copy Markdown
Contributor

@aboch it is changing the client package. That part is vendored into docker/cli and required here.

@aboch
Copy link
Copy Markdown
Author

aboch commented May 18, 2017

Oh I see, the whole client pkg is being used here. Got it.

@mavenugo
Copy link
Copy Markdown
Contributor

@nishanttotla we also have #62 which will be even later.
So, I dont see a reason to block this PR

@eyz
Copy link
Copy Markdown

eyz commented May 18, 2017

This will need a rebase after moby/moby#32981 is merged and vendor updated.

moby/moby#32981 was just merged

Time to rebase this PR?

@mavenugo
Copy link
Copy Markdown
Contributor

@eyz we are also waiting to pick up moby/moby#33239 as per @nishanttotla request.

Signed-off-by: Alessandro Boch <[email protected]>
@aboch
Copy link
Copy Markdown
Author

aboch commented May 18, 2017

@mavenugo Updated vendoring to include moby/moby#33239 and CI is now green

@mavenugo mavenugo merged commit d156151 into docker:master May 18, 2017
dhiltgen pushed a commit to dhiltgen/cli-1 that referenced this pull request Sep 20, 2018
[18.09] Add Version and Commit to build
nobiit pushed a commit to nobidev/docker-cli that referenced this pull request Nov 19, 2025
Do not log the CA config CA signing key in debug mode.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants