Commit graph

31630 commits

Author SHA1 Message Date
Vincent Demeester
b82f9622dc Merge pull request #31962 from dgageot/fix-31922
Windows: Fix Docker hanging with named pipes and stdin
2017-03-21 16:02:29 +01:00
Vincent Demeester
f965aab5e9 Merge pull request #31621 from dnephin/cleanup-container-run-command
Some cleanup of container run command
2017-03-21 16:01:11 +01:00
Jeremy Yallop
1a710c1660 Documentation for bind mount consistency flags.
Signed-off-by: Jeremy Yallop <yallop@docker.com>
2017-03-21 11:55:33 +00:00
David Gageot
97b572ea1b Windows: Fix Docker hanging with named pipes and stdin
Fixes #31922

Vendor a fork of Microsoft/go-winio that has this
PR (https://github.com/Microsoft/go-winio/pull/43)
merged


Signed-off-by: David Gageot <david@gageot.net>
2017-03-21 11:49:57 +01:00
Vincent Demeester
58ccdfe00c Merge pull request #31928 from Microsoft/jjh/cleanupremoving
Windows: graph cleanup '-removing'
2017-03-21 09:43:38 +01:00
Akihiro Suda
9a5bf4b5ad Merge pull request #29779 from thaJeztah/do-not-return-incorrect-error
NetworksPrune: do not return warnings as error
2017-03-21 16:28:54 +09:00
Sebastiaan van Stijn
0bc84fc06c Merge pull request #31596 from rootsongjc/dry-run-test
Wrong entrypoint in docker plugin example
2017-03-20 23:38:15 +01:00
Sebastiaan van Stijn
1ec77baed9 Merge pull request #31552 from ripcurld0/add_format_secretls
Add format to secret ls
2017-03-20 20:20:45 +01:00
Tonis Tiigi
acad599210 Fix cache for dockerfiles with multiple FROM
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-03-20 11:24:50 -07:00
Tonis Tiigi
09f308ce21 Fix ARG scoping for Dockerfiles with multiple FROM
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-03-20 11:24:44 -07:00
Vincent Demeester
550b06ab6a Merge pull request #31948 from vdemeester/compose-typo
Fixing a small typo in compose loader package
2017-03-20 17:48:50 +01:00
Vincent Demeester
2422d5ad35 Merge pull request #31669 from tonistiigi/files-filter
Fix inefficient file paths filter
2017-03-20 17:43:47 +01:00
John Howard (VM)
9910b9a7f0 Windows: graph cleanup '-removing'
Signed-off-by: John Howard (VM) <jhoward@ntdev.microsoft.com>
2017-03-20 09:15:27 -07:00
Vincent Demeester
1bb4eae43f Merge pull request #31943 from liker12134/fix-go-vetting-warning-unkeyed-fields
Fixed:go vetting warning unkeyed fields
2017-03-20 15:51:32 +01:00
Vincent Demeester
93eaec90aa Merge pull request #31946 from fate-grand-order/fixed
fix misspell in utils.go
2017-03-20 15:41:54 +01:00
Vincent Demeester
b8c45c3a57
Fixing a small typo in compose loader package
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-03-20 15:39:57 +01:00
Sebastiaan van Stijn
1ed277a268 Merge pull request #31915 from albers/fix-completion-node-update
Bash completion for `docker node update` completes only one node
2017-03-20 14:10:25 +01:00
fate-grand-order
2b79dbc89b fix misspell in utils.go
Signed-off-by: Helen Xie <chenjg@harmonycloud.cn>
2017-03-20 19:52:00 +08:00
Sebastiaan van Stijn
a8b20f4789 Merge pull request #31941 from felicianotech/fix/cli-build-heading
Fix 'Specify a Dockerfile (-f)' heading in Engine CLI Docs.
2017-03-20 12:51:47 +01:00
Vincent Demeester
5aa44cdf13 Merge pull request #31933 from cooltoast/master
Add Johannes Kepler and Mary Jackson to name generator
2017-03-20 11:27:17 +01:00
Vincent Demeester
3794e190ff Merge pull request #31882 from unclejack/fix_Dockerfile
Dockerfile: move comments to fix build error
2017-03-20 11:08:45 +01:00
Antonio Murdaca
3ab4961032
profiles: seccomp: allow clock_settime when CAP_SYS_TIME is added
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-03-20 11:05:23 +01:00
liker12134
2333b39b37 fixed:go vetting warning unkeyed fields
Signed-off-by: Aaron.L.Xu <liker.xu@foxmail.com>
2017-03-20 16:30:01 +08:00
Ricardo N Feliciano
0bd77d2381
Fix 'Specify a Dockerfile (-f)' heading in Engine CLI Docs.
Signed-off-by: Ricardo N Feliciano <FelicianoTech@gmail.com>
2017-03-19 18:05:12 -04:00
Boaz Shuster
e281fe9c3a Add format to secret ls
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
2017-03-19 09:22:30 +02:00
cooltoast
234b2203e5 Add Johannes Kepler and Mary Jackson to name generator
Signed-off-by: cooltoast <mpatel678@gmail.com>
2017-03-17 20:36:12 -07:00
Sebastiaan van Stijn
04da404175 Merge pull request #31891 from ngaro/master
Fix zsh-completion for containers in status 'created'
2017-03-18 03:09:29 +01:00
Nikolas Garofil
e5a327ff2f 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>
2017-03-18 02:09:34 +01:00
Brian Goff
a99c3bcd7f Merge pull request #31914 from albers/completion-rm-created
Improve bash completion for `docker rm`
2017-03-17 15:08:02 -04:00
Brian Goff
108dccaf51 Merge pull request #31905 from anusha-ragunathan/unmount-disable
Wait to unmount propagatedmount before marking plugin as disabled.
2017-03-17 14:37:40 -04:00
Vincent Demeester
8bc703804d Merge pull request #30781 from AkihiroSuda/fix-stack-env
compose: fix environment interpolation from the client
2017-03-17 15:56:50 +01:00
Vincent Demeester
0fe41cc4db Merge pull request #31820 from ehazlett/secrets-restrict
Restrict secret view to node level in controller
2017-03-17 14:25:32 +01:00
Harald Albers
aea95471c4 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>
2017-03-17 09:33:55 +01:00
Harald Albers
cac3775de8 Improve bash completion for docker rm
`docker rm` can delete containers in state=created, too.

Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-17 09:21:37 +01:00
Akihiro Suda
2cdc9c42eb compose: update the comment about MappingWithEquals
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-03-17 06:21:55 +00:00
Daniel J Walsh
881e20ee0b 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>
2017-03-16 20:33:37 -04:00
Victor Vieux
f148ad38e5 Merge pull request #31902 from thaJeztah/master-cherry-pick-31875
cherry-pick 31875 - update service-create.md
2017-03-16 15:36:34 -07:00
Anusha Ragunathan
70b76266b5 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>
2017-03-16 15:25:41 -07:00
Misty Stanley-Jones
2b939bdd67
Merge pull request #31875 from toolchainX/patch-2
update service-create.md
(cherry picked from commit 0f1ee84014)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-03-16 22:25:50 +01:00
David Xia
cd48633329
[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>
2017-03-16 16:49:15 -04:00
Sebastiaan van Stijn
d376b18caf Merge pull request #31896 from aaronlehmann/move-secretrequestoption
api: Remove SecretRequestOption type
2017-03-16 21:31:15 +01:00
Sebastiaan van Stijn
f5c57d88a4 Merge pull request #31886 from daniel48/master
fix a typo
2017-03-16 21:30:22 +01:00
Sebastiaan van Stijn
3eaeee07c3 Merge pull request #31894 from dnephin/fix-schema-id
Fix compose schema id for v3.2
2017-03-16 21:19:59 +01:00
Aaron Lehmann
e7c39f4d5d 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>
2017-03-16 11:20:31 -07:00
Daniel Nephin
576d2181e4 Fix compose schema id for v3.2
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-03-16 13:53:58 -04:00
Sebastiaan van Stijn
96ec447f3b Merge pull request #31890 from albers/completion-service-ls--filter-mode
Add bash completion for `service ls --filter mode`
2017-03-16 16:47:37 +01:00
Vincent Demeester
c1b04a8d6e Merge pull request #31513 from thaJeztah/better-handling-of-older-api-versions
Improve error handling of commands run against unsupported daemon
2017-03-16 16:46:06 +01:00
Harald Albers
8eac1daa81 Add bash completion for service ls --filter mode
Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-16 16:31:57 +01:00
Pure White
1d61f11e34 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>
2017-03-16 23:11:57 +08:00
Vincent Demeester
b6abfbafcd Merge pull request #31864 from Microsoft/jjh/failfsopshyperv
Windows: Fail fs ops on running Hyper-V containers gracefully
2017-03-16 16:00:34 +01:00