Commit Graph

4214 Commits

Author SHA1 Message Date
29e4b6071d Cleanup dockerfiles and circle
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 0f91d9e6c4
Component: cli
2017-07-18 12:22:28 -04:00
c912542d4f Merge pull request #350 from thaJeztah/unexport-commands
Unexport subcommands
Upstream-commit: a14762c6d2
Component: cli
2017-07-18 17:17:01 +02:00
ea84db7e56 Unexport subcommands
These commands were only used as subcommands, so did
not have to be exported.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9c7b0d74cd
Component: cli
2017-07-18 15:26:45 +02:00
7e5b932e43 Small refactor in system prune
Adapt "image prune" and "build cache prune" to have
the same signature as the other prune commands, so
that they can all be added to the "pruneFuncs" array.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 73163ee78b
Component: cli
2017-07-18 15:13:11 +02:00
6250958cd7 Merge pull request #315 from ripcurld0/nat_sort
Sort swarm stacks and nodes using natural sorting
Upstream-commit: 79e4d635ca
Component: cli
2017-07-18 15:01:11 +02:00
6db8c53375 Merge pull request #345 from vdemeester/remove-prune-package
Remove useless prune package 👼
Upstream-commit: 19efbc85f4
Component: cli
2017-07-18 14:46:53 +02:00
b7e7973a5f Merge pull request #266 from jphuynh/shellcheck
Add shellcheck for bash completion
Upstream-commit: b75596e1e4
Component: cli
2017-07-18 09:59:07 +02:00
8dbc530b62 Remove useless prune package 👼
The `cli/command/prune` just does some aliasing of `Prune*` methods,
doesn't have any use.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 3f4d91508e
Component: cli
2017-07-18 09:49:02 +02:00
2dc557d71e Fix: skip build-cache prune on unsupported versions
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6c3a448ecb
Component: cli
2017-07-17 11:55:35 +02:00
72d8e914bc Merge pull request #331 from yuexiao-wang/docker-search-filters
Fix filters displaying for docker search
Upstream-commit: 03a46a66bd
Component: cli
2017-07-14 23:30:43 -07:00
c6415e10ce Merge pull request #314 from allencloud/add-filter-scope-for-events
docs: add filter scope for command events and more cluster events
Upstream-commit: 47370b4863
Component: cli
2017-07-14 23:28:55 -07:00
42cbae8c65 Service privileges: CLI reference docs & completion
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 5cc7ac2990
Component: cli
2017-07-14 22:30:47 -07:00
c456febc9c docs: add filter scope for command events and more cluster events
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 8639c9baf8
Component: cli
2017-07-15 09:17:35 +08:00
d85711734b More about ARG and build stages.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ad5d035988
Component: cli
2017-07-14 16:59:21 -04:00
0b42de4e27 Clarify docs about ARG in FROM
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 2880030814
Component: cli
2017-07-14 16:55:42 -04:00
0667ef33f8 Add DOCKER_BUILD_ARGS to support build with proxy
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 7d8681fadb
Component: cli
2017-07-14 05:20:18 -04:00
5aee375eb4 Fix inconsistencies
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>
Upstream-commit: d7748e1b01
Component: cli
2017-07-14 09:24:46 +01:00
becbfbd6d3 docs: add documentation for dm.libdm_log_level
This is a new option added specifically to allow for debugging of bugs
in Docker's storage drivers or libdm itself.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
Upstream-commit: c7710819a5
Component: cli
2017-07-14 16:52:33 +10:00
d96f150bfb Fix filters displaying for docker search
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: bd64ad25fb
Component: cli
2017-07-14 08:56:20 +08:00
33db8883ea Fix code location when mounting to docker-cli-shell-validate
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>
Upstream-commit: ffe8509663
Component: cli
2017-07-13 22:24:08 +01:00
cbcb37cde8 Update dockerfile path for CicleCI build
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>
Upstream-commit: 501cf0e6d1
Component: cli
2017-07-13 22:24:08 +01:00
dc6c9cd967 Reword to remove ambiguity with go validate
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>
Upstream-commit: 2e7d24cae8
Component: cli
2017-07-13 22:24:08 +01:00
a61c7f009e Add shellcheck for bash completion
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>
Upstream-commit: b2fc35aefa
Component: cli
2017-07-13 22:24:08 +01:00
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