Update cli folder with newer changes from moby/moby#11
Merged
tiborvass merged 22 commits intodocker:masterfrom May 5, 2017
Merged
Update cli folder with newer changes from moby/moby#11tiborvass merged 22 commits intodocker:masterfrom
tiborvass merged 22 commits intodocker:masterfrom
Conversation
Collaborator
Author
|
Please don't merge it yet, in case i need to update it before my PR on moby/moby is merged. |
Collaborator
|
Yep, needs update it looks like. |
07ba16a to
9c4d4bc
Compare
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This is required for swarmkit to be able to filter based on log driver. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
Signed-off-by: Daniel Nephin <dnephin@docker.com>
This avoids issues when copy/pasting between different shells on different OSes, which may not all support `\` as a continuation character. Fixes #32725 Signed-off-by: Dave Henderson <dhenderson@gmail.com>
Signed-off-by: Ignacio Capurro <icapurrofagian@gmail.com>
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Signed-off-by: Vincent Demeester <vincent@demeester.fr>
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
These tests were caught in the crossfire of the transition to testify. testify has a few subtle differences from the similar custom framework it replaced: - Error behaves differently - Equal takes its arguments in a different order This PR also takes the opportunity to use a few shorthands from testify, such as Len, True, and False. Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
swarmkit's API type. Make sure this parameter gets propagated to swarmkit, and also add an extra option to the CLI when providing external CAs to parse the CA cert from a file. Signed-off-by: Ying Li <ying.li@docker.com>
This new flag will allow the configuration of an interface that can be used for data path traffic to be isolated from control plane traffic. This flag is simply percolated down to libnetwork and will be used by all the global scope drivers (today overlay) Negative test added for invalid flag arguments Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
StreamFormatter suffered was two distinct structs mixed into a single struct without any overlap. Signed-off-by: Daniel Nephin <dnephin@docker.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
This is synonymous with `docker run --cidfile=FILE` and writes the digest of
the newly built image to the named file. This is intended to be used by build
systems which want to avoid tagging (perhaps because they are in CI or
otherwise want to avoid fixed names which can clash) by enabling e.g. Makefile
constructs like:
image.id: Dockerfile
docker build --iidfile=image.id .
do-some-more-stuff: image.id
do-stuff-with <image.id
Currently the only way to achieve this is to use `docker build -q` and capture
the stdout, but at the expense of losing the build output.
In non-silent mode (without `-q`) with API >= v1.29 the caller will now see a
`JSONMessage` with the `Aux` field containing a `types.BuildResult` in the
output stream for each image/layer produced during the build, with the final
one being the end product. Having all of the intermediate images might be
interesting in some cases.
In silent mode (with `-q`) there is no change, on success the only output will
be the resulting image digest as it was previosuly.
There was no wrapper to just output an Aux section without enclosing it in a
Progress, so add one here.
Added some tests to integration cli tests.
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
Contributor
|
LGTM |
silvin-lubecki
pushed a commit
to silvin-lubecki/cli
that referenced
this pull request
Nov 30, 2017
Remove filter options for docker stack services command
chris-crone
pushed a commit
to chris-crone/cli
that referenced
this pull request
Jun 11, 2018
[18.03] Kubernetes stack features for Docker EE
nobiit
pushed a commit
to nobidev/docker-cli
that referenced
this pull request
Nov 19, 2025
Remove stack configs on stack removal
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
15 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
For the record, here is what I did from the moby/moby repo:
git filter-branch -f --prune-empty --subdirectory-filter cligit rebase -s recursive -Xsubtree=cli dockercli/masterwheredockercli/masteris the master branch from the docker/cli repo (a git remote that I added)git rebase --continuegit merge -s ours --no-commit HEADgit read-tree --reset -u HEADgit commit