Commit Graph

29629 Commits

Author SHA1 Message Date
70819077bf Merge pull request #31596 from rootsongjc/dry-run-test
Wrong entrypoint in docker plugin example
Upstream-commit: 0bc84fc06c4be2b48afd3e50f199316e2d4d94fb
Component: engine
2017-03-20 23:38:15 +01:00
730ccc302a Merge pull request #31552 from ripcurld0/add_format_secretls
Add format to secret ls
Upstream-commit: 1ec77baed9f87c9c7cb64ddd2ad203d800ba7efa
Component: engine
2017-03-20 20:20:45 +01:00
f75a21c954 Merge pull request #31948 from vdemeester/compose-typo
Fixing a small typo in compose loader package
Upstream-commit: 550b06ab6a9e9e0200b9b5d2f5cb5b7b7b4bb16a
Component: engine
2017-03-20 17:48:50 +01:00
dbaf00790d Merge pull request #31669 from tonistiigi/files-filter
Fix inefficient file paths filter
Upstream-commit: 2422d5ad35345e0ab24d3f22b96c1271f7c1e07d
Component: engine
2017-03-20 17:43:47 +01:00
75c49bae2f Merge pull request #31943 from liker12134/fix-go-vetting-warning-unkeyed-fields
Fixed:go vetting warning unkeyed fields
Upstream-commit: 1bb4eae43f4422e3ee6ea878f972d21dcf062fa4
Component: engine
2017-03-20 15:51:32 +01:00
eea1dff191 Merge pull request #31946 from fate-grand-order/fixed
fix misspell in utils.go
Upstream-commit: 93eaec90aa679d13c777efec59891a2ff325d571
Component: engine
2017-03-20 15:41:54 +01:00
8e8d5b8f70 Fixing a small typo in compose loader package
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: b8c45c3a570ad96ca59763361f6902ac694336d9
Component: engine
2017-03-20 15:39:57 +01:00
90c9dd45cd Merge pull request #31915 from albers/fix-completion-node-update
Bash completion for `docker node update` completes only one node
Upstream-commit: 1ed277a268948f67d142b69f44591998c35d1454
Component: engine
2017-03-20 14:10:25 +01:00
a835f1babb fix misspell in utils.go
Signed-off-by: Helen Xie <chenjg@harmonycloud.cn>
Upstream-commit: 2b79dbc89bf15c276145a0fa3d3728308349f86e
Component: engine
2017-03-20 19:52:00 +08:00
f5fe2997fb Merge pull request #31941 from felicianotech/fix/cli-build-heading
Fix 'Specify a Dockerfile (-f)' heading in Engine CLI Docs.
Upstream-commit: a8b20f47895a8d7a65ee270090ec0db92ebca977
Component: engine
2017-03-20 12:51:47 +01:00
4d5a6fd5d8 Merge pull request #31933 from cooltoast/master
Add Johannes Kepler and Mary Jackson to name generator
Upstream-commit: 5aa44cdf132788cc0cd28ce2393b44265dd400e9
Component: engine
2017-03-20 11:27:17 +01:00
366968b59a Merge pull request #31882 from unclejack/fix_Dockerfile
Dockerfile: move comments to fix build error
Upstream-commit: 3794e190ff17c96ffc5c0dc46bfb501057f32d69
Component: engine
2017-03-20 11:08:45 +01:00
3e18c0a07b fixed:go vetting warning unkeyed fields
Signed-off-by: Aaron.L.Xu <liker.xu@foxmail.com>
Upstream-commit: 2333b39b37cb7db80c66269d48c6f22dabf8973c
Component: engine
2017-03-20 16:30:01 +08:00
5e80470f62 Fix 'Specify a Dockerfile (-f)' heading in Engine CLI Docs.
Signed-off-by: Ricardo N Feliciano <FelicianoTech@gmail.com>
Upstream-commit: 0bd77d238137091b45b94dd8df6e4cb2151e44f5
Component: engine
2017-03-19 18:05:12 -04:00
6d6cf437f8 Add format to secret ls
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: e281fe9c3a0034e119e7718a142133e86f38a4f2
Component: engine
2017-03-19 09:22:30 +02:00
600635fabb Add Johannes Kepler and Mary Jackson to name generator
Signed-off-by: cooltoast <mpatel678@gmail.com>
Upstream-commit: 234b2203e576fa40236d388f79b5ccefd3558147
Component: engine
2017-03-17 20:36:12 -07:00
d24d60de69 Merge pull request #31891 from ngaro/master
Fix zsh-completion for containers in status 'created'
Upstream-commit: 04da4041757370fb6f85510c8977c5a18ddae380
Component: engine
2017-03-18 03:09:29 +01:00
476e7d708e Fix zsh-completion for containers in status 'created'
This patch makes sure that containers in the created-stated are
counted as stopped containers. Otherwise if you create a container,
don't run it and type: "docker rm ", followed by pressing tab in zsh, it won't show up.

Signed-off-by: Nikolas Garofil <nikolas.garofil@uantwerpen.be>
Signed-off-by: Nikolas Garofil <nikolas@garofil.be>
Upstream-commit: e5a327ff2fd0b129edf982dab113a39cd91471df
Component: engine
2017-03-18 02:09:34 +01:00
998da3bcb0 Merge pull request #31914 from albers/completion-rm-created
Improve bash completion for `docker rm`
Upstream-commit: a99c3bcd7f323ae64287af8b1d3b9d8e4fd87fed
Component: engine
2017-03-17 15:08:02 -04:00
ab5fc16144 Merge pull request #31905 from anusha-ragunathan/unmount-disable
Wait to unmount propagatedmount before marking plugin as disabled.
Upstream-commit: 108dccaf514b86c6d30c2c4e08af606fa2a4b5f1
Component: engine
2017-03-17 14:37:40 -04:00
bddb190597 Merge pull request #30781 from AkihiroSuda/fix-stack-env
compose: fix environment interpolation from the client
Upstream-commit: 8bc703804de45bafe4e6362d150d6c74db8dd7db
Component: engine
2017-03-17 15:56:50 +01:00
996aa3fb64 Merge pull request #31820 from ehazlett/secrets-restrict
Restrict secret view to node level in controller
Upstream-commit: 0fe41cc4db65372f66d79721344522159c173ae5
Component: engine
2017-03-17 14:25:32 +01:00
a7a954d57a Bash completion for docker node update completes only one node
`docker node update` accepts only one node.
Before this change, bash completion would complete additional nodes.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: aea95471c44defe7c3f9d4e8adc22f7dfdc237ab
Component: engine
2017-03-17 09:33:55 +01:00
b1ada390df Improve bash completion for docker rm
`docker rm` can delete containers in state=created, too.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: cac3775de8aa34bdff39db84239b86035eabe70b
Component: engine
2017-03-17 09:21:37 +01:00
95c8df3265 compose: update the comment about MappingWithEquals
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 2cdc9c42eb138bcaffb1cbd4172bd18b69446394
Component: engine
2017-03-17 06:21:55 +00:00
48ffb5882e Wait to unmount propagatedmount before marking plugin as disabled.
TestPluginTrustedInstall revealed a race in the plugin shutdown logic,
where the exit channel signal was sent even before the propagated mounts
were unmounted. If the same plugin was enabled, it would try to setup
propagated mounts *before* it was unmounted resulting in errors.

This change fixes the behavior by waiting until the unmount completes on
disable before marking the plugin as disabled.

Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
Upstream-commit: 70b76266b586d193c333aa37dcda031f3d89f108
Component: engine
2017-03-16 15:25:41 -07:00
6037448065 Merge pull request #31875 from toolchainX/patch-2
update service-create.md
(cherry picked from commit 0f1ee840143b230259544dbfc03205dafcd285ad)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2b939bdd67259fc6c94cd76cc60a550cc507a29f
Component: engine
2017-03-16 22:25:50 +01:00
bdbc2fdcab Merge pull request #31896 from aaronlehmann/move-secretrequestoption
api: Remove SecretRequestOption type
Upstream-commit: d376b18caf3c9e2f3535399b450dc25004be1ecc
Component: engine
2017-03-16 21:31:15 +01:00
8cf1672494 Merge pull request #31886 from daniel48/master
fix a typo
Upstream-commit: f5c57d88a4bc62a45cd76dc1648c522ff6c75599
Component: engine
2017-03-16 21:30:22 +01:00
f84a712c49 Merge pull request #31894 from dnephin/fix-schema-id
Fix compose schema id for v3.2
Upstream-commit: 3eaeee07c3e472e610a1dabf8d16558451307e38
Component: engine
2017-03-16 21:19:59 +01:00
8203424840 api: Remove SecretRequestOption type
This type is only used by CLI code. It duplicates SecretReference in the
types/swarm package. Change the CLI code to use that type instead.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: e7c39f4d5d761f68e6ac432934d8c3910e452855
Component: engine
2017-03-16 11:20:31 -07:00
6bac6aa413 Fix compose schema id for v3.2
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 576d2181e453dbbf75254aa11bc90c1a86a1384f
Component: engine
2017-03-16 13:53:58 -04:00
dda8534650 Merge pull request #31890 from albers/completion-service-ls--filter-mode
Add bash completion for `service ls --filter mode`
Upstream-commit: 96ec447f3b6d7be3bb3521ec6986e8423100975e
Component: engine
2017-03-16 16:47:37 +01:00
6f2998bb7e Merge pull request #31513 from thaJeztah/better-handling-of-older-api-versions
Improve error handling of commands run against unsupported daemon
Upstream-commit: c1b04a8d6ed90d4dad4162432a111dcd3a9b5a0b
Component: engine
2017-03-16 16:46:06 +01:00
9ac8903d98 Add bash completion for service ls --filter mode
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 8eac1daa81069fbb8f8777607e71ad71026bd81f
Component: engine
2017-03-16 16:31:57 +01:00
77ff3cda60 fix a typo
when i was using:
docker search --automated -s 3 nginx
told me:
Flag --automated has been deprecated, use --filter=automated=true instead
Flag --stars has been deprecated, use --filter=stars=3 instead
and when i use:
docker search --filter=automated=true --filter=stars=3 nginx
told me:
Error response from daemon: Invalid filter 'automated'
and i found out that the correct command should be:
docker search --filter=is-automated=true --filter=stars=3 nginx

Signed-off-by: Pure White <daniel48@126.com>
Upstream-commit: 1d61f11e34ba6f1efdfd29a03d92181586bdcb93
Component: engine
2017-03-16 23:11:57 +08:00
96285f84ba Merge pull request #31864 from Microsoft/jjh/failfsopshyperv
Windows: Fail fs ops on running Hyper-V containers gracefully
Upstream-commit: b6abfbafcd9e099b1d435f101c5665b5d918ed32
Component: engine
2017-03-16 16:00:34 +01:00
fb15a0149e Merge pull request #31881 from albers/completion-ps--format
Add bash completion for `node|service|stack ps --format`
Upstream-commit: c8d109842af3e684280d117a5583ec1c7d6237fc
Component: engine
2017-03-16 14:56:26 +01:00
1a16c7a021 Merge pull request #30777 from Microsoft/jjh/testexecwindowsopenhandles
Avoid TestExecWindowsOpenHandles timing out
Upstream-commit: ad7cc722d7b2cc9b58f9d43b27d05fc28f3d8cde
Component: engine
2017-03-16 14:55:24 +01:00
46f4bd1e00 Merge pull request #31832 from albers/completion-network-inspect--verbose
Add bash completion for `network inspect --verbose`
Upstream-commit: 1b2edb1ff64cba779f824785c83607426db76b1d
Component: engine
2017-03-16 14:52:21 +01:00
86e27c99e0 Merge pull request #31720 from jonjohnsonjr/always-head
Always HEAD blobs at least once during pushes
Upstream-commit: 4261687d787d07c2b00985e6517e23d3ce2e01dd
Component: engine
2017-03-16 14:39:02 +01:00
1dd3435923 Merge pull request #31850 from yummypeng/ignore-layer-does-not-exist
Ignore `layer does not exist` error from `docker images`
Upstream-commit: 11eb4fe70cd30cd04c017dc669932cf4e66d2dde
Component: engine
2017-03-16 14:38:39 +01:00
104e798680 Merge pull request #31619 from rcjsuen/patch-1
Fix typo in sample output
Upstream-commit: aa534d3bb27774475b41c95d39f62448ab7893de
Component: engine
2017-03-16 14:22:17 +01:00
8021eb2bf2 Improve error handling of commands run against unsupported daemon
The current error-handling only checked for version annotations
on the subcommand itself, but did not check the top-level command.

This patch always traverses the command path (parents), and
prints an error if the command is not supported.

Before this change:

    $ docker service
    Usage:	docker service COMMAND

    Manage services

    Options:
          --help   Print usage

    Commands:
      create      Create a new service
      inspect     Display detailed information on one or more services
      ls          List services
      ps          List the tasks of one or more services
      rm          Remove one or more services
      scale       Scale one or multiple replicated services
      update      Update a service

    Run 'docker service COMMAND --help' for more information on a command.

    $ docker service ls
    ID                  NAME                MODE                REPLICAS            IMAGE

After this change:

    $ DOCKER_API_VERSION=1.12 docker service
    docker service requires API version 1.24, but the Docker daemon API version is 1.12

    $ DOCKER_API_VERSION=1.12 docker service ls
    docker service ls requires API version 1.24, but the Docker daemon API version is 1.12

    $ DOCKER_API_VERSION=1.24 docker plugin --help
    docker plugin requires API version 1.25, but the Docker daemon API version is 1.24

    $ DOCKER_API_VERSION=1.25 docker plugin upgrade --help
    docker plugin upgrade requires API version 1.26, but the Docker daemon API version is 1.25

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 15d63f1c5ba40a0937a935c866c384c953c79b16
Component: engine
2017-03-16 13:45:50 +01:00
943990f090 Add missing API version annotations to commands
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e638089622af0448ee0d5d95c45575b63338c938
Component: engine
2017-03-16 13:40:12 +01:00
169ed37aca Dockerfile: move comments to fix build error
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: c7c92359460f7fde1c3d42df437cd8a37d9f73d2
Component: engine
2017-03-16 14:07:31 +02:00
62570f10fa Merge pull request #31858 from unclejack/remove_redundant_options_check
pkg/archive/diff.go: avoid redundant options init
Upstream-commit: 23750ce5351669934bdbe85f010d6fea60820797
Component: engine
2017-03-16 05:05:03 -07:00
c1f37bd95e Add bash completion for node|service|stack ps --format
Also add `--quiet|-q` where it was missing.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 1bf7d2c2b41b2a76aaa887cdb1e4b02ea3fd336c
Component: engine
2017-03-16 12:59:32 +01:00
7a360dfa15 Merge pull request #31775 from erxian/misleading-default-for-update-monitor-duration-flag
misleading default for --update-monitor duration
Upstream-commit: 52143aee95f9464c73bf1bc31f9d8274e5922cd4
Component: engine
2017-03-16 10:13:26 +01:00
4298695e1f Merge pull request #31866 from gdevillele/pr_service_create
improve semantics of utility function in cli/command/service
Upstream-commit: 8316753f96c84a904ae7a43416bd5d7944bfbc6f
Component: engine
2017-03-16 10:12:15 +01:00