Граф коммитов

28306 Коммитов

Автор SHA1 Сообщение Дата
Harald Albers df486631bc Move bash completion logic to new subcommand: images
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-25 09:57:47 +02:00
Harald Albers 75aede3a7c Move bash completion logic to new subcommand: load
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-25 09:57:47 +02:00
Harald Albers 9eb1f55402 Delegate bash completion for `docker {container,image} inspect` to parameterized function
In #23614 `docker inspect` was semantically enhanced to inspect "everything".
Therefore moving its logic to `_docker_container_inspect` was not correct.

This commit moves it back to its original top-level location (`_docker_inspect`)
so that it can be called by `_docker_{container,image}_inspect` and others (will
be added in follow-up PRs).
Parameterization was added in order to get caller-specific behavior.

Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-25 09:57:38 +02:00
Steve Durrheimer 94b6376ee5
Fix zsh completion for 'docker exec --env'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-10-25 09:05:07 +02:00
Steve Durrheimer 20890b4aad
Add zsh completion for 'dockerd --shutdown-timeout'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-10-25 08:59:23 +02:00
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
Akihiro Suda 7e24c16086 add `docker network prune`
`docker network prune` prunes unused networks, including overlay ones.
`docker system prune` also prunes unused networks.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-10-25 06:43:54 +00: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
Tonis Tiigi b1014428c1 Refactor swarm node config to struct
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-10-24 16:36:50 -07:00
John Howard eea679fbcc Windows: Set service recovery options
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-10-24 16:24:27 -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 d2e64247e6
Taking stop-signal into account when docker kill
If a container sets a stop-signal, taking it into account to disable or
not the restart policy.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-10-24 11:10:14 -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
Harald Albers e93298650d Move bash completion logic to new subcommand: import
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-24 01:37:52 -07:00
Harald Albers 9059b9532e Move bash completion logic to new subcommand: history
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-24 01:37:52 -07:00
Harald Albers db31883a92 Move bash completion logic to new subcommand: build
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-24 01:37:52 -07:00
Harald Albers 33910a89b9 Add bash completion for new `docker image` command family
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-24 01:37:52 -07:00
Tonis Tiigi 37a3be2449 Move stdio attach from libcontainerd backend to callback
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-10-24 00:20:36 -07: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
John Howard 9127818414 Windows: Honour escape directive fully
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-10-21 14:22:14 -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