beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
28137 commits 14 branches 412 tags 338 MiB
Commit graph

28137 commits

This branch
This branch
All branches
Author SHA1 Message Date
Steve Durrheimer
34f5d97468
Add zsh completion for 'docker {create,run} --stop-timeout' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-10-25 08:55:00 +02:00
Sebastiaan van Stijn
28ef366cea Merge pull request #27526 from AkihiroSuda/update-network-inspect-doc 
[doc] update docs/reference/commandline/network_inspect.md
 2016-10-24 21:21:54 -07:00
Akihiro Suda
2c288e60db update docs/reference/commandline/network_inspect.md 
The following sentences (introduced in v1.11 via #21160) were misleading for Swarm mode services (>= v1.12)

  For networks backed by multi-host network driver, such as Overlay,
  this command also shows the container endpoints in other hosts in the
  cluster. These endpoints are represented as "ep-{endpoint-id}" in the output.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-10-25 02:46:59 +00:00
Sebastiaan van Stijn
f901c5ed1c Merge pull request #27699 from yongtang/27695-info-duplicate-nat-null-plugin 
Remove duplicate `nat`, `null` in `docker info` for Windows
 2016-10-24 18:41:34 -07:00
Aaron Lehmann
4882c263c6 Merge pull request #27703 from aaronlehmann/fix-test-name 
integration-cli: Fix style of swarm test name
 2016-10-24 18:23:33 -07:00
Sebastiaan van Stijn
411e7b4416 Merge pull request #24533 from yongtang/24392-docker-info-label-duplicate-keys 
Remove duplicate keys in labels of `docker info`
 2016-10-24 18:12:28 -07:00
Vincent Demeester
ec30cf4f14 Merge pull request #27697 from amitkris/fix_units_import 
Correct go-units import in cli/command/formatter/stats.go
 2016-10-24 16:59:15 -07:00
Sebastiaan van Stijn
ba41a5edac Merge pull request #27223 from mlaventure/merge-experimental 
Make experimental a runtime flag
 2016-10-24 16:58:32 -07:00
Aaron Lehmann
073d811587 integration-cli: Fix style of swarm test name 
A recent change fixed integration tests to use "API" in test names
instead of "Api". A new test was added in a PR opened before this
change, and didn't benefit from the cleanup. Fix its name.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-10-24 16:45:17 -07:00
Vincent Demeester
09985ad897 Merge pull request #27624 from erxian/remove-duplicate-err-judgement 
remove duplicated error judgement in cluster.go
 2016-10-24 16:11:53 -07:00
Yong Tang
3347aba957 Remove duplicate nat, null in docker info for Windows 
This fix tries to address the issue raised in 27695 where
duplicate `nat` and `null` has been listed in `docker info`
for Windows.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-10-24 15:21:14 -07:00
Kenfe-Mickael Laventure
7781a1bf0f Make experimental a runtime flag 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-10-24 15:20:01 -07:00
Amit Krishnan
cf8a667b8d Correct go-units import in cli/command/formatter/stats.go 
from src/github.com/docker/go-units -> github.com/docker/go-units

Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
 2016-10-24 15:06:58 -07:00
Vincent Demeester
67b85f9d26 Merge pull request #26354 from KingEmet/fixbranch 
make GetAll use client.List as the source of truth
 2016-10-24 14:25:24 -07:00
Brian Goff
0ab13dda66 Merge pull request #26848 from miaoyq/del-a-redundant-err-return 
Delete a redundant error return
 2016-10-24 11:27:08 -07:00
Vincent Demeester
96efb2cf25 Merge pull request #27578 from yuexiao-wang/update-network 
Fix the incorrect links in the document about network and service
 2016-10-24 08:05:04 -07:00
yuexiao-wang
49e8c3d8d0 Fix the incorrect links in the document about network and service 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-10-24 22:01:38 +08:00
Sebastiaan van Stijn
b2786a3888 Merge pull request #27546 from yuexiao-wang/fix-subtitle 
Update the subtitle for stack ps
 2016-10-23 22:28:43 -07:00
Vincent Demeester
1f9beceacc Merge pull request #27660 from Microsoft/jjh/git2.10.1 
Windows dockerfile: Changes to support git 2.10.1
 2016-10-23 00:06:27 +02:00
John Howard
929fa9ff80 Windows dockerfile: Changes to support git 2.10.1 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-10-22 13:07:28 -07:00
John Howard
935d4d1c17 Merge pull request #27616 from Microsoft/jjh/microsoftprefix 
Windows: Overhaul Dockerfile.windows and test image name
 2016-10-22 13:01:40 -07:00
Vincent Demeester
daca6baceb Merge pull request #27655 from albers/completion-exec--env 
Fix bash completion for `docker exec --env`
 2016-10-22 21:54:19 +02:00
Harald Albers
4126229741 Fix bash completion for docker exec --env 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-10-22 08:14:59 -07:00
Vincent Demeester
ce6cfef36d Merge pull request #27460 from Microsoft/jjh/dockerpid 
Windows: Calculate PID file after root
 2016-10-22 13:41:42 +02:00
Vincent Demeester
9058ec3be5 Merge pull request #27596 from aaronlehmann/rolling-restart 
Add force option to service update
 2016-10-22 13:37:12 +02:00
Sebastiaan van Stijn
b54a1d83fa Merge pull request #27630 from runcom/fix-info-route 
api/server/router/system: fix info versioning
 2016-10-21 18:58:10 -07:00
Sebastiaan van Stijn
a6688959b4 Merge pull request #26973 from allencloud/change-code-in-container-restore 
change code in container restore
 2016-10-21 18:53:37 -07:00
Sebastiaan van Stijn
064eda192e Merge pull request #27640 from thaJeztah/carry-26348-update-remote-api 
[carry 26348] Update cURL connection example in remote API reference
 2016-10-21 18:17:33 -07:00
Sebastiaan van Stijn
3c385b9f6b Merge pull request #27117 from dnephin/swagger-gen 
Add swagger.yaml and generate a few types from the spec
 2016-10-21 18:15:28 -07:00
Yanqiang Miao
2d126f190d Delete a redundant error return 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2016-10-22 08:53:57 +08:00
Aaron Lehmann
c9fdf9abf8 Add force option to service update 
Currently, there's no way to restart the tasks of a service without
making an actual change to the service. This leads to us giving awkward
workarounds as in
https://github.com/docker/docker.github.io/pull/178/files, where we tell
people to scale a service up and down to restore balance, or make
unnecessary changes to trigger a restart.

This change adds a --force option to "docker service update", which
forces the service to be updated even if no changes require that.

Since rolling update parameters are respected, the user can use
"docker service --force" to do a rolling restart. For example, the
following is supported:

   docker service update --force --update-parallelism 2 \
   --update-delay 5s myservice

Since the default value of --update-parallelism is 1, the default
behavior is to restart the service one task at a time.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-10-21 17:43:27 -07:00
John Howard
9a19bd1b45 Windows: Update Dockerfile.windows 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-10-21 16:06:29 -07:00
Kenfe-Mickaël Laventure
87ae571fed Merge pull request #27609 from tonistiigi/fix-chroot-shared-parent 
chroot: remount everything as private in new mntns
 2016-10-21 14:40:40 -07:00
Victor Vieux
d0e6dae233 Merge pull request #27522 from vieux/data_race_plugins 
prevent data race in pkg/plugins
 2016-10-21 14:19:48 -07:00
Victor Vieux
f7af80860c prevent data race in pkg/plugins 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-10-21 13:28:13 -07:00
Sebastiaan van Stijn
2e0d6e6be2
Update cURL example for cURL 7.40 differences 
cURL 7.50 changed the validation for URL's
when using socket connections. cURL 7.4x
did not expect a hostname, whereas cURL
7.5x and above _requires_ a hostname.

See https://github.com/curl/curl/issues/936

This updates the example to take both
versions into account, because cURL 7.4x
is still widely used by distros.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-10-21 11:40:58 -07:00
Gerwim
587b186f85 Update docker_remote_api.md 
See https://github.com/docker/docker/issues/26099#issuecomment-245007539

Signed-off-by: Gerwim Feiken <g.feiken@tfe.nl>
 2016-10-21 11:34:08 -07:00
Misty Stanley-Jones
78dae2a037 Merge pull request #27575 from yuexiao-wang/fix-cli-link 
Modify the links for docker container commands
 2016-10-21 11:15:57 -07:00
Sebastiaan van Stijn
95c36b301b Merge pull request #27579 from albers/completion-container 
Add bash completion for new `docker container` subcommands
 2016-10-21 09:47:55 -07:00
Sebastiaan van Stijn
32b541e443 Merge pull request #27405 from tonistiigi/fix-fifo2 
Fix issues with fifos blocking on open
 2016-10-21 09:44:33 -07:00
Sebastiaan van Stijn
0c767f0a6c Merge pull request #27490 from caarlos0/editorconfig 
added editorconfig
 2016-10-21 09:15:17 -07:00
Vincent Demeester
29f676564d Merge pull request #27618 from allencloud/vendor-go-units 
revendor go-units to update more accurate duration display
 2016-10-21 17:14:20 +02:00
Harald Albers
93ccf95db1 Move bash completion logic to new subcommand: wait 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-10-21 12:39:32 +02:00
Harald Albers
f9a24c72ba Move bash completion logic to new subcommand: update 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-10-21 12:39:32 +02:00
Harald Albers
6ac201721f Move bash completion logic to new subcommand: unpause 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-10-21 12:39:32 +02:00
Harald Albers
4bab104761 Move bash completion logic to new subcommand: top 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-10-21 12:39:32 +02:00
Harald Albers
150dcabc0f Move bash completion logic to new subcommand: stop 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-10-21 12:39:32 +02:00
Harald Albers
19f31f8e48 Move bash completion logic to new subcommand: stats 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-10-21 12:39:32 +02:00
Harald Albers
2bbfd01e7a Move bash completion logic to new subcommand: start 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-10-21 12:39:32 +02:00
Harald Albers
5200d18dbf Move bash completion logic to new subcommand: run 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-10-21 12:39:32 +02:00