3f7ca09fc6
Merge pull request #193 from andrewhsu/bump-rc3
...
[17.07] bump version to 17.07.0-ce-rc3
2017-08-15 11:00:43 -07:00
a8a6fce600
sync components/engine/client changes with cli vendor
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
2017-08-14 17:57:55 -07:00
4ba586edd7
bump version to 17.07.0-ce-rc3
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
2017-08-14 19:30:58 +00:00
282553a460
bump version to 17.07.0-ce-rc2
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
2017-08-04 17:36:17 -07:00
a060b0ab9e
Merge pull request #177 from thaJeztah/17.07-backport-stack-host-bridge-nets
...
[17.07] backport Skip inspect of built-in networks on stack deploy
2017-08-04 17:22:57 -07:00
ef6b38478e
Merge pull request #168 from thaJeztah/17.07-backport-keep-alive
...
[17.07] Enable TCP Keep-Alive in Docker client
2017-08-04 16:53:36 -07:00
9097af4c13
Skip inspects of built-in networks on stack deploy
...
Signed-off-by: Alex Mavrogiannis <alex.mavrogiannis@docker.com >
(cherry picked from commit 7f53c99dfegithub@gone.nl >
2017-08-04 11:16:44 +02:00
1451e5e581
Add Infinit plugin
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
(cherry picked from commit 83e8551876github@gone.nl >
2017-08-03 22:14:21 +02:00
fcf5a9d689
update service create and update options in commandline documentation
...
Signed-off-by: zebrilee <zebrilee@gmail.com >
(cherry picked from commit 5fe09164f5github@gone.nl >
2017-08-03 22:14:14 +02:00
3402a4fe4f
modify foo by container in order to clarify the documentation
...
Signed-off-by: zebrilee <zebrilee@gmail.com >
(cherry picked from commit 2d5f9d83e7github@gone.nl >
2017-08-03 22:14:07 +02:00
598ea37b90
Docs: update filter options for docker container ps
...
The `is-task` filter was only documented in the usage
section, but this section is not used in the documentation.
This patch adds the missing filter, synchronises the
man page source, and does some slight rephrasing
and reformatting of the filters.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 46064f33f4github@gone.nl >
2017-08-03 22:14:00 +02:00
965908e8ce
Enable TCP Keep-Alive in Docker client
...
Some network environments may have NATs, proxies, or gateways which
kill idle connections. There are many Docker API operations which may
be idle for long periods of time (such as ContainerWait and ContainerAttach)
and may result in unexpected connection closures or hangs if TCP keepalives
are not used.
This patch updates the default HTTP transport used by the Docker client
package to enable TCP Keep-Alive with a keep-alive interval of 30 seconds.
It also sets a connect timeout of 30 seconds.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
(cherry picked from commit 2831a04cbagithub@gone.nl >
2017-08-03 21:33:02 +02:00
450a1a63d7
bump version to 17.07.0-ce-rc1
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
2017-07-25 18:35:19 -07:00
e4c6e38322
Fix CODEOWNERS patterns.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: cea8b4f4f3
2017-07-18 18:25:55 -04: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
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
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
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
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
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
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
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
5f448ae97b
Update gometalinter
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 7a8f75a25a
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
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
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
