Commit Graph
28417 Commits
Author SHA1 Message Date
Justin Cormack 30025daf04 Add shell completions to tgz
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 1c6f5b5fff92fcb6220da7b9422f4d6134985fdf
Component: engine
2016-10-25 13:43:55 +01:00
Harald Albers 1e590ce972 Add support for multiple containers to bash completion for docker pause
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 2e44e74874e721d7bc635b91b6870f5d000be177
Component: engine
2016-10-25 14:24:59 +02:00
Harald Albers 2c4abfd9cc Add bash completion for docker export --output
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 3ac19862f2a797d8136e0248615fe16d6cc2faeb
Component: engine
2016-10-25 14:18:13 +02:00
Justin Cormack 44e77a4b4f Build docker-proxy from git checkout like other external binaries
This means we can vendor libnetwork without special casing, and
it is built the same way as the other external binaries.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 3996975b0840033bda3919440d122d734a4bc66b
Component: engine
2016-10-25 13:13:22 +01:00
Steve Durrheimer 8c365fa5ad Add zsh completion for 'dockerd --experimental'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 11b6c4c58a5fe46bc2094276dcc27b552b607398
Component: engine
2016-10-25 11:26:39 +02:00
Harald Albers 757c98f6b1 Add bash completion for dockerd --experimental
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: e63f19653661c3d39a5d4fccf6e335cdb5ed2c6b
Component: engine
2016-10-25 10:04:48 +02:00
Harald Albers 7b5e480927 Move bash completion logic to new subcommand: tag
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 28469b572033e2a0cd3509d1789dc70a63e2a141
Component: engine
2016-10-25 09:57:47 +02:00
Harald Albers 94d4fdd472 Move bash completion logic to new subcommand: save
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 18e8c59fbbf2356d502982f1051ea6dc60a3113f
Component: engine
2016-10-25 09:57:47 +02:00
Harald Albers 6054af3621 Move bash completion logic to new subcommand: rmi
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 01c259e08a43679e6cd406d236b1da48ad1e7204
Component: engine
2016-10-25 09:57:47 +02:00
Harald Albers 1e98008b15 Move bash completion logic to new subcommand: push
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 2d139df59cc2791ef3c343f773311aa3ae000413
Component: engine
2016-10-25 09:57:47 +02:00
Harald Albers d190c409fe Move bash completion logic to new subcommand: pull
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 6864f3ae5a3acb127fe4199540d789fba1ef0bd4
Component: engine
2016-10-25 09:57:47 +02:00
Harald Albers 915231aaf9 Move bash completion logic to new subcommand: images
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: df486631bcaff7cb54f5e326f687085724e8de79
Component: engine
2016-10-25 09:57:47 +02:00
Harald Albers af1d3eba23 Move bash completion logic to new subcommand: load
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 75aede3a7c23385a7cc44c81710a6e790199870e
Component: engine
2016-10-25 09:57:47 +02:00
Harald Albers 73e8ea8277 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>
Upstream-commit: 9eb1f554028aab84beaed0d5ff6ecbcbd3848594
Component: engine
2016-10-25 09:57:38 +02:00
Steve Durrheimer b218d45d9c Fix zsh completion for 'docker exec --env'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 94b6376ee5c9ccb52bbab9101360cfe97727b4b1
Component: engine
2016-10-25 09:05:07 +02:00
Steve Durrheimer e853b13d88 Add zsh completion for 'dockerd --shutdown-timeout'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 20890b4aadad4deb52d3896572b32c550fd369f0
Component: engine
2016-10-25 08:59:23 +02:00
Steve Durrheimer eaf4354320 Add zsh completion for 'docker {create,run} --stop-timeout'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 34f5d97468ca92c2209312205b0637a96c39a593
Component: engine
2016-10-25 08:55:00 +02:00
Akihiro Suda 4fb550ce0f 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>
Upstream-commit: 7e24c16086a9a4f38e241e51837f2be4877c04a6
Component: engine
2016-10-25 06:43:54 +00:00
Sebastiaan van Stijn 999dfab48f Merge pull request #27526 from AkihiroSuda/update-network-inspect-doc
[doc] update docs/reference/commandline/network_inspect.md
Upstream-commit: 28ef366ceab60d6ff15b343171da6ff2d5d0992e
Component: engine
2016-10-24 21:21:54 -07:00
Akihiro Suda 0780040018 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>
Upstream-commit: 2c288e60db1ecd47842e92432fbe0ab367033374
Component: engine
2016-10-25 02:46:59 +00:00
Sebastiaan van Stijn db3c1eebdd Merge pull request #27699 from yongtang/27695-info-duplicate-nat-null-plugin
Remove duplicate `nat`, `null` in `docker info` for Windows
Upstream-commit: f901c5ed1c76d507a09079935e680f8c5bdd9070
Component: engine
2016-10-24 18:41:34 -07:00
Aaron Lehmann 082a38d3c8 Merge pull request #27703 from aaronlehmann/fix-test-name
integration-cli: Fix style of swarm test name
Upstream-commit: 4882c263c6223ace5272c6d5c203c79e73e6ffcb
Component: engine
2016-10-24 18:23:33 -07:00
Sebastiaan van Stijn cf0e8d8d85 Merge pull request #24533 from yongtang/24392-docker-info-label-duplicate-keys
Remove duplicate keys in labels of `docker info`
Upstream-commit: 411e7b4416fbac0601db1fa28b5152c23fcaf7bb
Component: engine
2016-10-24 18:12:28 -07:00
Vincent Demeester b9b1cc3362 Merge pull request #27697 from amitkris/fix_units_import
Correct go-units import in cli/command/formatter/stats.go
Upstream-commit: ec30cf4f14d8f8536b1b7b81e2992eb5c7021b1c
Component: engine
2016-10-24 16:59:15 -07:00
Sebastiaan van Stijn 11895badbe Merge pull request #27223 from mlaventure/merge-experimental
Make experimental a runtime flag
Upstream-commit: ba41a5edac16857121779434cd80b86dcdb0ffda
Component: engine
2016-10-24 16:58:32 -07:00
Aaron Lehmann eb042db21d 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>
Upstream-commit: 073d8115871f15ad36b6ab34e2af1f8f22ec333f
Component: engine
2016-10-24 16:45:17 -07:00
Tonis Tiigi 179ef095e3 Refactor swarm node config to struct
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: b1014428c11a5495e713f2ab6df5aae45e8a46a6
Component: engine
2016-10-24 16:36:50 -07:00
John Howard 45d81820a1 Windows: Set service recovery options
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: eea679fbcc0aff9ce99e37b2251866800de0deae
Component: engine
2016-10-24 16:24:27 -07:00
Vincent Demeester 4e1fb8f8f9 Merge pull request #27624 from erxian/remove-duplicate-err-judgement
remove duplicated error judgement in cluster.go
Upstream-commit: 09985ad89741dcc7cf0f8add500189d09d484b61
Component: engine
2016-10-24 16:11:53 -07:00
Yong Tang 9798db7e18 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>
Upstream-commit: 3347aba95762955fe17916e8cfc66aabbd6d66d6
Component: engine
2016-10-24 15:21:14 -07:00
Kenfe-Mickael Laventure 9a299b360f Make experimental a runtime flag
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 7781a1bf0fef748877326632b88e92fbf3c90daa
Component: engine
2016-10-24 15:20:01 -07:00
Amit Krishnan cd0bcedad7 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>
Upstream-commit: cf8a667b8d84a596a27c51608a529115b68647cc
Component: engine
2016-10-24 15:06:58 -07:00
Vincent Demeester dee80812af Merge pull request #26354 from KingEmet/fixbranch
make GetAll use client.List as the source of truth
Upstream-commit: 67b85f9d26f1b0b2b240f2d794748fac0f45243c
Component: engine
2016-10-24 14:25:24 -07:00
Brian Goff c42c998198 Merge pull request #26848 from miaoyq/del-a-redundant-err-return
Delete a redundant error return
Upstream-commit: 0ab13dda66613c403a06d69f8aff5d4b2e3b289e
Component: engine
2016-10-24 11:27:08 -07:00
Vincent Demeester 051c4d005f 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>
Upstream-commit: d2e64247e6dfd3257a7d015890aa2f168ff643a0
Component: engine
2016-10-24 11:10:14 -07:00
Vincent Demeester efd79c3c13 Merge pull request #27578 from yuexiao-wang/update-network
Fix the incorrect links in the document about network and service
Upstream-commit: 96efb2cf25394b1589aced296e27f3928dc9c229
Component: engine
2016-10-24 08:05:04 -07:00
yuexiao-wang 6eaaf1f7ae Fix the incorrect links in the document about network and service
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 49e8c3d8d0c24a4a550732e4c4377646330e2e44
Component: engine
2016-10-24 22:01:38 +08:00
Harald Albers b64eef3181 Move bash completion logic to new subcommand: import
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: e93298650d052c7ed29148a3012f4b710620af2f
Component: engine
2016-10-24 01:37:52 -07:00
Harald Albers 5beb4da007 Move bash completion logic to new subcommand: history
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 9059b9532e96412e84d59823765aa19095a5bd84
Component: engine
2016-10-24 01:37:52 -07:00
Harald Albers f0c1f13e31 Move bash completion logic to new subcommand: build
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: db31883a92e0189e2fd85f36cdbc48a21d83f788
Component: engine
2016-10-24 01:37:52 -07:00
Harald Albers 945515f373 Add bash completion for new docker image command family
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 33910a89b930bfba2f85188260a9d105d0b96c50
Component: engine
2016-10-24 01:37:52 -07:00
Tonis Tiigi 1883869e16 Move stdio attach from libcontainerd backend to callback
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 37a3be2449d2a314305615ffcc287a598a829dba
Component: engine
2016-10-24 00:20:36 -07:00
Sebastiaan van Stijn 4e59434f98 Merge pull request #27546 from yuexiao-wang/fix-subtitle
Update the subtitle for stack ps
Upstream-commit: b2786a388817784e8abde3da1b67e50b58cc8b7a
Component: engine
2016-10-23 22:28:43 -07:00
Vincent Demeester c01f7998fd Merge pull request #27660 from Microsoft/jjh/git2.10.1
Windows dockerfile: Changes to support git 2.10.1
Upstream-commit: 1f9beceacc916756bd5894f36306727ec9c6c008
Component: engine
2016-10-23 00:06:27 +02:00
John Howard 65f0de5a38 Windows dockerfile: Changes to support git 2.10.1
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 929fa9ff8075d91624a90ecaae9c1fd31e50c294
Component: engine
2016-10-22 13:07:28 -07:00
John Howard 04213eed5f Merge pull request #27616 from Microsoft/jjh/microsoftprefix
Windows: Overhaul Dockerfile.windows and test image name
Upstream-commit: 935d4d1c179259a262eb15fbf7e2bba2df26d740
Component: engine
2016-10-22 13:01:40 -07:00
Vincent Demeester 9ef056cc6d Merge pull request #27655 from albers/completion-exec--env
Fix bash completion for `docker exec --env`
Upstream-commit: daca6bacebbf098fdb84e5865c592f376691f1fd
Component: engine
2016-10-22 21:54:19 +02:00
Harald Albers f65987b601 Fix bash completion for docker exec --env
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 41262297416dcb007224d7d3e7e4aae19d3e9e7b
Component: engine
2016-10-22 08:14:59 -07:00
Vincent Demeester b33468451a Merge pull request #27460 from Microsoft/jjh/dockerpid
Windows: Calculate PID file after root
Upstream-commit: ce6cfef36d6fa52df6ebdd3dd996d6bebe0f308d
Component: engine
2016-10-22 13:41:42 +02:00
Vincent Demeester 04894a8f04 Merge pull request #27596 from aaronlehmann/rolling-restart
Add force option to service update
Upstream-commit: 9058ec3be5edaa313caa02371ebe7d7ac64f2faa
Component: engine
2016-10-22 13:37:12 +02:00