Commit Graph
36672 Commits
Author SHA1 Message Date
Sebastiaan van Stijn 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
Vincent Demeester 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
Vincent Demeester 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
Antonio Murdaca d823652d21 profiles: seccomp: allow clock_settime when CAP_SYS_TIME is added
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 3ab4961032315abb4fd4ed813034a114d1d55699
Component: engine
2017-03-20 11:05:23 +01:00
liker12134 5d9a5ce7dd fixed:go vetting warning unkeyed fields
Signed-off-by: Aaron.L.Xu <liker.xu@foxmail.com>
Upstream-commit: cc44dec589
Component: cli
2017-03-20 16:30:01 +08:00
liker12134 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
Ricardo N Feliciano 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
Boaz Shuster 6963169966 Use formatter in docker checkpoint ls
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: b8d5b0f675
Component: cli
2017-03-19 09:24:15 +02:00
Boaz Shuster c622412e5c Use formatter in docker checkpoint ls
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: f9d2636787e2c1c1bff02f51fded9094236e235a
Component: engine
2017-03-19 09:24:15 +02:00
Boaz Shuster bbac6dc261 Add format to secret ls
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 1bac314da5
Component: cli
2017-03-19 09:22:30 +02:00
Boaz Shuster 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
cooltoast 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
Sebastiaan van Stijn 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
Nikolas Garofil 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
Brian Goff 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
Brian Goff 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
Vincent Demeester 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
Vincent Demeester 7332a7a5de Merge pull request #30781 from AkihiroSuda/fix-stack-env
compose: fix environment interpolation from the client
Upstream-commit: 6e24fc3f58
Component: cli
2017-03-17 15:56:50 +01:00
Vincent Demeester 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
Harald Albers 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
Harald Albers 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
Akihiro Suda 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
Akihiro Suda abd145043b compose: update the comment about MappingWithEquals
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 2fc6cd4b71
Component: cli
2017-03-17 06:21:55 +00:00
Daniel J Walsh 31a7299a25 If caller specifies label overrides, don't override security options
If a caller specifies an SELinux type or MCS Label and still wants to
share an IPC Namespace or the host namespace, we should allow them.
Currently we are ignoring the label specification if ipcmod=container
or pidmode=host.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Upstream-commit: 881e20ee0be4bf048fb3b7e7f4c12b076a1607bb
Component: engine
2017-03-16 20:33:37 -04:00
Victor Vieux 5060d78d5a Merge pull request #31902 from thaJeztah/master-cherry-pick-31875
cherry-pick 31875 - update service-create.md
Upstream-commit: f148ad38e5c555189bed4515657cbb741916b094
Component: engine
2017-03-16 15:36:34 -07:00
Anusha Ragunathan 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
Misty Stanley-Jones 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
David Xia d688c75815 [docs] Fix incorrect docker inspect example
Fixed incorrect `docker inspect` example in docs.
Verify by running the old and new commands.

fixes #31900

Signed-off-by: David Xia <dxia@spotify.com>
Upstream-commit: cd48633329437bc153bd3611fbe13f6ca9805a0a
Component: engine
2017-03-16 16:49:15 -04:00
Sebastiaan van Stijn 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
Sebastiaan van Stijn 540d48f844 Merge pull request #31896 from aaronlehmann/move-secretrequestoption
api: Remove SecretRequestOption type
Upstream-commit: 2222824fd9
Component: cli
2017-03-16 21:31:15 +01:00
Sebastiaan van Stijn 8cf1672494 Merge pull request #31886 from daniel48/master
fix a typo
Upstream-commit: f5c57d88a4bc62a45cd76dc1648c522ff6c75599
Component: engine
2017-03-16 21:30:22 +01:00
Sebastiaan van Stijn d88d78826a Merge pull request #31886 from daniel48/master
fix a typo
Upstream-commit: a3a3e2dba6
Component: cli
2017-03-16 21:30:22 +01:00
Sebastiaan van Stijn 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
Sebastiaan van Stijn ad43a90ae5 Merge pull request #31894 from dnephin/fix-schema-id
Fix compose schema id for v3.2
Upstream-commit: 1aca09b8cc
Component: cli
2017-03-16 21:19:59 +01:00
Aaron Lehmann 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
Aaron Lehmann 8698efadf8 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: 395081fc6b
Component: cli
2017-03-16 11:20:31 -07:00
Daniel Nephin 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
Daniel Nephin db27025447 Fix compose schema id for v3.2
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: d0fb25319b
Component: cli
2017-03-16 13:53:58 -04:00
Kenfe-Mickael Laventure 340a67b151 Cleanup docker tmp dir on start
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 9c451ad0f2afdb598110539aac9f731a36deb6cf
Component: engine
2017-03-16 09:01:29 -07:00
Sebastiaan van Stijn 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
Vincent Demeester 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
Harald Albers 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
Pure White 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
Pure White e28e72773d 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: 7fe0d2d64d
Component: cli
2017-03-16 23:11:57 +08:00
Brian Goff edcb2d10ec Use generic handler for pprof profile lookups
This more (in spirit) mimics the handler usage in net/http/pprof.
It also makes sure that any new profiles that are added are
automatically supported (e.g. `mutex` profiles in go1.8).

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: a1b06933aff80763ec62a288d5178a4321be1baa
Component: engine
2017-03-16 11:05:20 -04:00
Vincent Demeester 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
Vincent Demeester 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
Vincent Demeester 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
Sebastiaan van Stijn 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
Vincent Demeester 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