Commit Graph

4191 Commits

Author SHA1 Message Date
a090086ff6 Sort swarm stacks and nodes using natural sorting
This commit changes the order stacks and nodes are displayed.
For example, running "docker stack ls" is expected to
display the following list:

NAME          SERVICES
service-1     1
service-2     1
service-10    1

However, currently this is what is printed:

NAME          SERVICES
service-1     1
service-10    1
service-2     1

To fix this, "docker stack ls" and "docker node ls" are using
natural sorting to make it more human readable.

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 1333b49194
Component: cli
2017-07-13 14:33:02 +03:00
3c42375fa5 Merge pull request #206 from dnephin/why-cross-so-slow
Faster CI
Upstream-commit: e3746d388e
Component: cli
2017-07-13 09:36:18 +02:00
38d61f1225 Merge pull request #271 from tych0/password-stdin
Password stdin
Upstream-commit: ae38f202bb
Component: cli
2017-07-12 17:08:11 -07:00
ac7952530f Fix warning in docker CLI when swarm ca --ca-cert, etc. flags are passed,
and add a test.

Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: 4615c92f66
Component: cli
2017-07-12 14:56:28 -07:00
5f448ae97b Update gometalinter
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 7a8f75a25a
Component: cli
2017-07-12 15:21:41 -04:00
cdbad2a1c4 Fix test and lint failures
Split test cases.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: f27934376d
Component: cli
2017-07-12 11:37:35 -04:00
8658bf36a0 Merge pull request #323 from dnephin/add-code-owners
Add a new CODEOWNERS file, and add a few owners
Upstream-commit: bb795aa7af
Component: cli
2017-07-12 13:28:24 +02:00
e4f148de96 Merge pull request #277 from thaJeztah/dont-remove-what-isnt-there
Don't attempt to remove unsupported resources on older daemon
Upstream-commit: 87345ed117
Component: cli
2017-07-12 10:43:54 +02:00
316c35cc99 Merge pull request #299 from dnephin/less-verbose-fake-cli
Less verbose fake cli
Upstream-commit: fa7687a362
Component: cli
2017-07-12 09:56:43 +02:00
d73fe10e9e Update some tests to remove unnecessary buffers.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 42a3800783
Component: cli
2017-07-11 17:52:43 -04:00
b0276ff8b1 Add a new CODEOWNERS file, and add a few owners.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 91a5efd882
Component: cli
2017-07-11 17:40:25 -04:00
b37b45da61 Remove unnecessary use of SetConfigfile
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3da0cbfdd1
Component: cli
2017-07-11 14:49:30 -04:00
1e5fbb03aa Update FakeCli to remove duplication in tests.
Use byte buffers by default, since that is what is done most of the time.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 69b142b52a
Component: cli
2017-07-11 14:49:30 -04:00
152c598ec8 Pin all tools used in the Dockerfiles
Also update gometalinter to use the official version. The update
found some new gosimple errors, which are fixed.

Also update the filewatcher script for the latest version of filewatcher.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 102a8f0c9d
Component: cli
2017-07-11 14:23:27 -04:00
07b047e230 login: add a --password-stdin argument
This:

* conflicts with --password (naturally)
* conflicts with the absence of --username (both can't be grabbed by the
  stdin)
* strips a trailing newline off the password if it exists

Signed-off-by: Tycho Andersen <tycho@tycho.ws>
Upstream-commit: 7d18477bc2
Component: cli
2017-07-11 12:16:29 -06:00
dcefa0bb91 Don't attempt to remove unsupported resources on older daemon
When running `docker stack rm <some stack>` against an older daemon,
a warning was printed for "configs" being ignored;

    WARNING: ignoring "configs" (requires API version 1.30, but the Docker daemon API version is 1.26)

Given that an old daemon cannot _have_ configs, there should not be
a need to warn, or _attempt_ to remove these resources.

This patch removes the warning, and skips fetching (and removing)
configs.

A check if _secrets_ are supported by the daemon is also added,
given that this would result in an error when attempted against
an older (pre 1.13) daemon.

There is one situation where this could lead to secrets or
configs being left behind; if the client is connecting to a
daemon that _does_ support secrets, configs, but the API version
is overridden using `DOCKER_API_VERSION`, no warning is printed,
and secrets and configs are not attempted to be removed.

Given that `DOCKER_API_VERSION` is regarded a feature for
debugging / "power users", it should be ok to ignore this.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2429f15672
Component: cli
2017-07-11 10:29:03 -07:00
4df758062c Merge pull request #312 from thaJeztah/remove-unused-prune-functions
Remove unused prune functions
Upstream-commit: 6908e58f0f
Component: cli
2017-07-11 12:15:44 +02:00
d29a2e376a Merge pull request #318 from thaJeztah/pin-vndr
pin vndr to 9909bb2b8a0b7ea464527b376dc50389c90df587
Upstream-commit: b7b680590b
Component: cli
2017-07-11 12:14:59 +02:00
97978c93db Remove bash completion for service update --network
The `--network` option is only available for `docker service create`.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: e7e77b5e65
Component: cli
2017-07-11 11:20:18 +02:00
e54b9b8905 pin vndr to 9909bb2b8a0b7ea464527b376dc50389c90df587
This make updating vndr a deliberate action, and
prevents updates to vndr from making the vendor
validation fail in CI.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 008785f5b5
Component: cli
2017-07-10 14:31:57 -07:00
740312d66e Remove unused prune functions
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d8a2972cb1
Component: cli
2017-07-10 13:27:19 -07:00
f217147904 Revendor dependencies
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 3e3c9d69d8
Component: cli
2017-07-10 10:56:42 -07:00
e7c8bab937 Merge pull request #298 from dnephin/fix-stack-out-stream
Fix stack output stream
Upstream-commit: af6c0896f5
Component: cli
2017-07-10 09:23:23 +02:00
3578bb4ff2 Merge pull request #259 from aaronlehmann/service-progress-surface-error
progress: Show task error in place of progress bar
Upstream-commit: 7ae9bc141c
Component: cli
2017-07-09 00:04:38 -07:00
b41167fb89 Merge pull request #270 from tych0/warn-only-about-password-on-cli
login: print a big warning when using --password
Upstream-commit: c99530b1d2
Component: cli
2017-07-08 16:37:40 -07:00
aa221f747d Fix typo (proceed -> precede)
Signed-off-by: Valentin Lorentz <progval+git@progval.net>
Upstream-commit: 4f3a8aecad
Component: cli
2017-07-07 13:17:15 +02:00
f002184455 progress: Light refactor
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: c9b92a328d
Component: cli
2017-07-06 10:40:35 -07:00
b0f07c55f2 fixing SIGSEGV when running containers
Signed-off-by: Yassine TIJANI <yasstij11@gmail.com>

moving the deffering of the close after the error checking

Signed-off-by: Yassine TIJANI <yasstij11@gmail.com>

fixing SIGSEGV when running containers

Signed-off-by: Yassine TIJANI <yasstij11@gmail.com>
Upstream-commit: 45b0e7cf1a
Component: cli
2017-07-06 18:57:36 +02:00
e249ded12b Merge pull request #211 from ksouf/issue-37-add-tests-on-commands
adding network_create tests 
Upstream-commit: 1aa82bc7df
Component: cli
2017-07-06 08:59:15 +02:00
e839364f20 Merge pull request #296 from thaJeztah/fix-error-overwrite
Fix error variable being overwritten
Upstream-commit: e672589ec0
Component: cli
2017-07-05 19:26:27 -07:00
259b5f4251 adding unit tests to network
Signed-off-by: khaled souf <khaled.souf@gmail.com>
Upstream-commit: 57c1551991
Component: cli
2017-07-06 00:54:30 +02:00
a9905bfdd7 Fix error variable being overwritten
The `err` variable was set in a loop, so only
the last result was taken into account to return
"failure" or not.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 4d4c789cac
Component: cli
2017-07-05 13:54:57 -07:00
5f5ef4ba5a Add parallelism to cross build
Reusable docker engine

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 1eb66d60bd
Component: cli
2017-07-05 15:23:32 -04:00
2af533daad Remove duplication in task formatting.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 0030bfea9f
Component: cli
2017-07-05 13:40:47 -04:00
6d92cf3a08 Fix stream for 'nothing found in stack' message
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: fb6deb1077
Component: cli
2017-07-05 13:32:54 -04:00
9c9fdfadf7 update tests for new image struct
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e8080dd7e5
Component: cli
2017-07-04 20:34:24 -07:00
542cf421f5 Bump moby to 87df0e533b619c088091fd1e2310e92bb9a24822
Includes changes from;

- Add a LastTagTime for images (https://github.com/moby/moby/pull/31497)
- Fix handling of remote "git@" notation (https://github.com/moby/moby/pull/33696)
- Move some `api` package functions away (https://github.com/moby/moby/pull/33798) (related to https://github.com/docker/cli/pull/236)
- Set ping version even on error (https://github.com/moby/moby/pull/33827)
- Do not add duplicate platform information to service spec (https://github.com/moby/moby/pull/33867)
- Refactor MountPoint Setup function in volume.go (https://github.com/moby/moby/pull/33890)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 366d3ec971
Component: cli
2017-07-04 20:23:38 -07:00
36ea5491ac Merge pull request #287 from thaJeztah/use-v1.0.0-tag-for-go-difflib
Use v1.0.0 tag for go-difflib
Upstream-commit: dc9feff879
Component: cli
2017-07-04 17:32:00 +02:00
2a3613893d Merge pull request #276 from adshmh/add-unit-tests-to-checkpoint-package
add unit tests to checkpoint package
Upstream-commit: 3554d02f33
Component: cli
2017-07-04 11:17:25 -04:00
9fdb37ee64 Merge pull request #288 from thaJeztah/bump-go-winio
Bump go-winio to 0.4.2
Upstream-commit: e08cb59c8a
Component: cli
2017-07-04 16:59:32 +02:00
5305c7b28b Merge pull request #248 from albers/completion-network-create--scope
Add bash completion for `network create --scope|--config-only|config-from`
Upstream-commit: 306212574a
Component: cli
2017-07-04 16:48:18 +02:00
58665dca40 Merge pull request #246 from albers/completion-prune--filter-label
Add bash completion for `label` filter of `prune` commands
Upstream-commit: 1f45f1b5f9
Component: cli
2017-07-04 16:44:23 +02:00
4f68746145 Merge pull request #282 from albers/completion-daemon-updates
Updates to bash completion for `dockerd`
Upstream-commit: 42a31ff8c1
Component: cli
2017-07-04 16:42:10 +02:00
e562168436 Merge pull request #285 from albers/completion-overlay2.size
Add bash completion for `dockerd --storage-opt overlay2.size`
Upstream-commit: d47bbb8358
Component: cli
2017-07-04 16:41:35 +02:00
d2b6d249be Merge pull request #243 from vieux/scale2
add `--detach` to docker scale 
Upstream-commit: 43fb4a4547
Component: cli
2017-07-04 16:36:59 +02:00
460a63fa01 Add bash completion for dockerd --metrics-addr
`--metrics-addr` does not accept network interface names.
Therefore `__docker_local_interfaces` was refined for this feature to
optionally exclude interface names.

Note that although `--metrics-addr` is experimental, it cannot be
selectively enabled in bash completion because the test for the daemon
running in experimental mode requires a running daemon. As this
completion pertains to starting the daemon, this requirement is not met.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 0ea31afd57
Component: cli
2017-07-04 14:40:22 +02:00
f186d3c42f Merge pull request #289 from mstanleyjones/multiple-env
Provide examples for multiple uses of the same flag
Upstream-commit: 357ff50fa9
Component: cli
2017-07-04 12:48:20 +02:00
72c6de1018 Merge pull request #292 from thaJeztah/clarify-docker-go-package
Clarify docker/go package
Upstream-commit: 8df4cd1edc
Component: cli
2017-07-03 23:44:26 -07:00
e415e09501 Clarify docker/go package
This package is used by Notary. Add a comment to
the vendor.conf file to explain what it contains
and what it's used for.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 60fe70c900
Component: cli
2017-07-03 18:00:46 -07:00
9e2f4854f6 Clarify that you can use -d and --rm together now
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: c63485b47d
Component: cli
2017-07-03 16:43:41 -07:00