summaryrefslogtreecommitdiff
path: root/cli
Commit message (Collapse)AuthorAgeFilesLines
* cli: remove cli/config package, integrate into cmd/dockerdSebastiaan van Stijn2022-12-141-27/+0
| | | | | | | | | | | | The configDir (and "DOCKER_CONFIG" environment variable) is now only used for the default location for TLS certificates to secure the daemon API. It is a leftover from when the "docker" and "dockerd" CLI shared the same binary, allowing the DOCKER_CONFIG environment variable to set the location for certificates to be used by both. This patch merges it into cmd/dockerd, which is where it was used. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* cli: move cobra customizations into cmd/dockerdSebastiaan van Stijn2022-12-143-173/+0
| | | | | | | | | The cli package is a leftover from when the "docker" and "dockerd" cli were both maintained in this repository; the only consumer of this is now the dockerd CLI, so we can move this code (it should not be imported by anyone). Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* cli: remove unused Errors typeSebastiaan van Stijn2022-12-141-18/+0
| | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* add instructions to generate events message table binCrazyMax2022-04-141-0/+8
| | | | Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
* use go-winres for cross to create Windows resourcesCrazyMax2022-04-146-0/+63
| | | | Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
* remove uses of deprecated pkg/termSebastiaan van Stijn2020-04-211-1/+1
| | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* allow running `dockerd` in an unprivileged user namespace (rootless mode)Akihiro Suda2019-02-041-0/+2
| | | | | | | | | | | Please refer to `docs/rootless.md`. TLDR: * Make sure `/etc/subuid` and `/etc/subgid` contain the entry for you * `dockerd-rootless.sh --experimental` * `docker -H unix://$XDG_RUNTIME_DIR/docker.sock run ...` Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
* Various code-cleanupSebastiaan van Stijn2018-05-231-2/+2
| | | | | | remove unnescessary import aliases, brackets, and so on. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Remove unused help commandSebastiaan van Stijn2018-05-191-20/+0
| | | | | | | dockerd has no subcommands, so the help command is not used. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Use Cobra built-in --version featureSebastiaan van Stijn2018-05-191-0/+1
| | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Use HasAvailableFlags instead of HasFlags for Options in helpSebastiaan van Stijn2018-05-191-1/+1
| | | | | | | | > HasAvailableFlags checks if the command contains any flags (local > plus persistent from the entire structure) which are not hidden or > deprecated. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Add canonical import commentDaniel Nephin2018-02-056-6/+6
| | | | Signed-off-by: Daniel Nephin <dnephin@docker.com>
* Update logrus to v1.0.1Derek McGowan2017-07-312-2/+2
| | | | | | Fixes case sensitivity issue Signed-off-by: Derek McGowan <derek@mcgstyle.net>
* Remove unused functionsVincent Demeester2017-06-031-69/+0
| | | | Signed-off-by: Vincent Demeester <vincent@sbr.pm>
* Remove `cli/flags` packageVincent Demeester2017-06-014-173/+3
| | | | | | | | | | | - Moving the `common*.go` files in `cmd/dockerd` directly (it's the only place it's getting used) - Rename `cli/flags` to `cli/config` because it's the only thing left in that package 👼 Now, `integration-cli` does *truly* not depend on `cobra` stuff. Signed-off-by: Vincent Demeester <vincent@sbr.pm>
* Move cli.Configdir away (in `flags`).Vincent Demeester2017-05-293-5/+3
| | | | | | | This makes integration not depend anymore of `cli` and thus not require `cobra` and other packages to compile. Signed-off-by: Vincent Demeester <vincent@sbr.pm>
* Merge pull request #32587 from dmcgowan/trust-key-configSebastiaan van Stijn2017-05-111-3/+0
|\ | | | | Expose trust key path in config
| * Expose trust key path in configDerek McGowan2017-05-101-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows storing key under any directory. In the case where the "/etc/docker" directory is not preserved, this file can be specified to a location where it will be preserved to ensure the ID does not change across restarts. Note this key is currently only used today to generate the ID used in Docker info and for manifest schema v1 pushes. The key signature and finger on these manifests are not checked or used any longer for security, deprecated by notary. Removes old key migration from a pre-release of Docker which put the key under the home directory and was used to preserve ID used for swarm v1 after the file moved. closes #32135 Signed-off-by: Derek McGowan <derek@mcgstyle.net>
* | Remove composeColin Hebert2017-05-061-475/+0
|/ | | | Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
* Remove cmd/docker and other directories in cli/ in accordance with the new ↵Arnaud Porterie (icecrime)2017-05-05361-39714/+29
| | | | | | | | | | | | | | | | | | | Moby project scope Starting with this commit, integration tests should no longer rely on the docker cli, they should be API tests instead. For the existing tests the scripts will use a frozen version of the docker cli with a DOCKER_API_VERSION frozen to 1.30, which should ensure that the CI remains green at all times. To help contributors develop and test manually with a modified docker cli, this commit also adds a DOCKER_CLI_PATH environment variable to the Makefile. This allows to set the path of a custom cli that will be available inside the development container and used to run the integration tests. Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com> Signed-off-by: Tibor Vass <tibor@docker.com>
* Add `docker build --iidfile=FILE`Ian Campbell2017-05-051-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Merge pull request #32972 from thaJeztah/compose-move-labels-to-3.3Brian Goff2017-05-053-2/+499
|\ | | | | Move "labels" to compose 3.3 format
| * Move "labels" to compose 3.3 formatSebastiaan van Stijn2017-05-023-2/+499
| | | | | | | | | | | | | | | | | | | | Commit bb5dfdb8c5acd48f17498b111db360820a50baec added a labels option to the docker-compose file format, but added it to the 3.2 schema. This patch moves the change to the 3.3 schema Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | Merge pull request #32876 from YuPengZTE/devIneffectualAssignmentVincent Demeester2017-05-031-6/+9
|\ \ | | | | | | delete ineffectual assignment
| * | delete ineffectual assignmentyupengzte2017-04-281-6/+9
| | | | | | | | | | | | Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
* | | Refacator pkg/streamformatterDaniel Nephin2017-05-023-3/+3
| |/ |/| | | | | | | | | | | StreamFormatter suffered was two distinct structs mixed into a single struct without any overlap. Signed-off-by: Daniel Nephin <dnephin@docker.com>
* | Merge pull request #32843 from ehazlett/stack-service-filterVincent Demeester2017-05-021-3/+1
|\ \ | | | | | | Remove service runtime filter in stack command
| * | remove service runtime filter in stack commandEvan Hazlett2017-04-261-3/+1
| | | | | | | | | | | | Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
* | | Merge pull request #32828 from cyli/external-ca-certBrian Goff2017-04-281-0/+11
|\ \ \ | | | | | | | | Add the `CACert` parameter to the `ExternalCA` object
| * | | Add the CACert parameter to the ExternalCA object in order to matchYing Li2017-04-261-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge pull request #32504 from dongluochen/healthcheck_durationBrian Goff2017-04-272-6/+6
|\ \ \ \ | | | | | | | | | | do not allow duration less than 1 ms in healthcheck parameters
| * | | | do not allow duration less than 1 ms in healthcheck parametersDong Chen2017-04-122-6/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dong Chen <dongluo.chen@docker.com>
* | | | | Merge pull request #32717 from fcrisciani/data_pathBrian Goff2017-04-273-0/+7
|\ \ \ \ \ | | | | | | | | | | | | Data path traffic separation option in swarm mode
| * | | | | Inroduce SWARM --data-path-addr flagFlavio Crisciani2017-04-263-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | Merge pull request #31557 from ripcurld0/add_stack_lsSebastiaan van Stijn2017-04-263-46/+150
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Add the format option to the docker stack ls command
| * | | | | Add format to docker stack lsBoaz Shuster2017-04-253-46/+150
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
* | | | | | Merge pull request #32564 from dnephin/compose-file-rel-dirTõnis Tiigi2017-04-263-10/+34
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Set Composefile WorkingDir to dirname of the composefile.
| * | | | | Set Composefile WorkingDir to dirname of the composefile.Daniel Nephin2017-04-173-10/+34
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Daniel Nephin <dnephin@docker.com>
* | | | | Merge pull request #32829 from aaronlehmann/cli-image-tests-correctionsVincent Demeester2017-04-2611-41/+44
|\ \ \ \ \ | | | | | | | | | | | | cli: Correct command/image tests for testify
| * | | | | cli: Correct command/image tests for testifyAaron Lehmann2017-04-2511-41/+44
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Merge pull request #32540 from cpuguy83/add_logdrivers_to_infoKenfe-Mickaël Laventure2017-04-251-0/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | | Add logdrivers to /info
| * | | | Add logdrivers to /infoBrian Goff2017-04-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required for swarmkit to be able to filter based on log driver. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
* | | | | Merge pull request #32817 from vdemeester/fix-win-itJohn Howard2017-04-253-12/+24
|\ \ \ \ \ | | | | | | | | | | | | Fix docker run -it on windows
| * | | | | Fix docker run -it on windowsVincent Demeester2017-04-253-12/+24
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Vincent Demeester <vincent@demeester.fr>
* | | | | move service runtime filter to serverEvan Hazlett2017-04-252-5/+0
|/ / / / | | | | | | | | | | | | Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
* | | | Merge pull request #32470 from runcom/remove-init-clientVincent Demeester2017-04-251-3/+0
|\ \ \ \ | | | | | | | | | | remove --init-path from client
| * | | | remove --init-path from clientAntonio Murdaca2017-04-101-3/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Antonio Murdaca <runcom@redhat.com>
* | | | | Merge pull request #32248 from icapurro/cli-image-testsVincent Demeester2017-04-2458-123/+1445
|\ \ \ \ \ | | | | | | | | | | | | Unit tests for cli/command/image package
| * | | | | Unit tests for cli/commands/image (except build and tag)Ignacio Capurro2017-04-2358-123/+1445
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ignacio Capurro <icapurrofagian@gmail.com>
* | | | | | Merge pull request #32731 from hairyhenderson/one-line-swarm-join-output-32725John Howard2017-04-244-14/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Output `docker swarm join` command on a single line when running `docker swarm init`
View Lorry Controller Status