7419227176
Merge pull request #351 from dnephin/misc-cleanup
...
Misc cleanup of dockerfiles and circleci
Upstream-commit: 257e113542
2017-07-18 10:44:51 -07:00
7c2dc55ca3
Remove unnecessary prune function aliases.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: ff350a04cb
2017-07-18 12:25:45 -04:00
29e4b6071d
Cleanup dockerfiles and circle
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 0f91d9e6c4
2017-07-18 12:22:28 -04:00
c912542d4f
Merge pull request #350 from thaJeztah/unexport-commands
...
Unexport subcommands
Upstream-commit: a14762c6d2
2017-07-18 17:17:01 +02:00
fa129caef8
Merge pull request #341 from thaJeztah/small-prune-refactor
...
Small refactor in system prune
Upstream-commit: 3209cb8da6
2017-07-18 10:45:21 -04: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
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
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
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
2017-07-18 14:46:53 +02:00
b7e7973a5f
Merge pull request #266 from jphuynh/shellcheck
...
Add shellcheck for bash completion
Upstream-commit: b75596e1e4
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
2017-07-18 09:49:02 +02:00
cc2a1a7847
Merge pull request #340 from thaJeztah/fix-dont-prune-build-cache
...
Fix: skip build-cache prune on unsupported versions
Upstream-commit: 277f4b997c
2017-07-18 09:41:37 +02:00
2dc557d71e
Fix: skip build-cache prune on unsupported versions
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 6c3a448ecb
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
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
2017-07-14 23:28:55 -07:00
759b91249c
Merge pull request #338 from thaJeztah/carry-moby-32483
...
Service privileges: CLI reference docs & completion
Upstream-commit: 9c9fe9bf1f
2017-07-14 23:26:52 -07:00
42cbae8c65
Service privileges: CLI reference docs & completion
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 5cc7ac2990
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
2017-07-15 09:17:35 +08:00
6d6adf9904
Merge pull request #333 from dnephin/docs-arg-in-from-take-2
...
Improve docs about ARG in FROM
Upstream-commit: fe24806ee5
2017-07-14 18:04:53 -07:00
d85711734b
More about ARG and build stages.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: ad5d035988
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
2017-07-14 16:55:42 -04:00
a50b8e5956
Merge pull request #335 from coolljt0725/add_env
...
Add DOCKER_BUILD_ARGS to support build with proxy
Upstream-commit: 0c8d401cd8
2017-07-14 11:41:44 -04:00
0667ef33f8
Add DOCKER_BUILD_ARGS to support build with proxy
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 7d8681fadb
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
2017-07-14 09:24:46 +01:00
c8dfc96c37
Merge pull request #324 from cyphar/libdm-debug-flag-docs
...
docs: add documentation for dm.libdm_log_level
Upstream-commit: de4c546b7e
2017-07-14 00:58:38 -07: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
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
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
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
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
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
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
2017-07-13 14:33:02 +03:00
3c42375fa5
Merge pull request #206 from dnephin/why-cross-so-slow
...
Faster CI
Upstream-commit: e3746d388e
2017-07-13 09:36:18 +02:00
38d61f1225
Merge pull request #271 from tych0/password-stdin
...
Password stdin
Upstream-commit: ae38f202bb
2017-07-12 17:08:11 -07:00
e7e9eef224
Merge pull request #328 from cyli/de-duplicate-CAcert-flag
...
Fix warning in docker CLI when `swarm ca` is called with flags other than `--rotate`
Upstream-commit: dcd788b100
2017-07-12 16:45:50 -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
2017-07-12 14:56:28 -07:00
34e1a128cc
Merge pull request #329 from dnephin/fix-linter-master
...
Update gometalinter
Upstream-commit: 6d74d8c13c
2017-07-12 13:21:24 -07:00
5f448ae97b
Update gometalinter
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 7a8f75a25a
2017-07-12 15:21:41 -04:00
0ca3fff735
Merge pull request #326 from dnephin/fix-merged-pr-conflicts
...
Fix test and lint failures on master
Upstream-commit: 25d9594f0b
2017-07-12 09:34:14 -07:00
cdbad2a1c4
Fix test and lint failures
...
Split test cases.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: f27934376d
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
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
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
2017-07-12 09:56:43 +02:00
a05235a1e0
Merge pull request #322 from dnephin/pin-tools
...
Pin all tools used in the Dockerfiles
Upstream-commit: 8b451c598f
2017-07-12 08:58:33 +02:00
d73fe10e9e
Update some tests to remove unnecessary buffers.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 42a3800783
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
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
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
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
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
2017-07-11 12:16:29 -06:00
