msabansal
e31fdfde0e
Enabling specifying static ip for predefined network on windows
...
Signed-off-by: msabansal <sabansal@microsoft.com >
Upstream-commit: 1991f6ebd6a5e496d291d96f8bb2aca3f2e9cd0b
Component: engine
2016-06-30 14:33:27 -07:00
Charles Smith
14e8a9a9a9
add menu.md, make index.md command line reference, update typos/minor errors in cli docs
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: f98f596c19cb589569ec89bd12d562d8ddd03843
Component: engine
2016-06-30 14:30:11 -07:00
Nicola Kabar
624acb6899
[Docs] clarified local volume driver docs
...
Signed-off-by: Nico <nicolaka@gmail.com >
Upstream-commit: 841f9859944250585b2adf2c9bf2ad5332ccc0bd
Component: engine
2016-06-30 14:15:44 -07:00
Tibor Vass
c93d8a8a0f
Merge pull request #24125 from vdemeester/24117-node-task-filter
...
Fix --filter=desired_state behaviour
Upstream-commit: 9d18fda08d3ae4d9654f1fc1ec7a1f8afefebf75
Component: engine
2016-06-30 14:08:05 -07:00
Brian Goff
2cb691411c
Volume mounts need to use "Binds" API field
...
Swarm was putting volume type mounts into the container config's
"Volumes" field, but really these need to go into "Binds".
"Volumes" is only for normal "-v /foo" volumes, not named volumes or
anything else.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 2bc2165cbf3e949921d1659f09841b5f008f590d
Component: engine
2016-06-30 17:00:52 -04:00
Sebastiaan van Stijn
8b734d8800
Merge pull request #24100 from hypriot/revert-tasksmax-workaround-21628
...
Revert tasksmax workaround to avoid unsupported bins
Upstream-commit: 295a6a37dcb5b2671a7df6bd3182c14d79f79ae0
Component: engine
2016-06-30 13:20:33 -07:00
Alexander Morozov
12cfc36ae8
Merge pull request #23631 from mlaventure/unstuck-ci-hangs-with-warning
...
Prevent CI from getting stuck if shims are left alive
Upstream-commit: 3926d9839468380e277f445f876b47478d51c07e
Component: engine
2016-06-30 11:41:41 -07:00
Derek McGowan
77d5dd2b46
Treat digest only images as dangling
...
Add test for dangling digest images
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 8906f8307c86ce59f51d2f1b750f5e698f3cf8a5
Component: engine
2016-06-30 11:32:49 -07:00
Alexander Morozov
6bcf7ca500
Merge pull request #24091 from AkihiroSuda/fixZFS24008
...
zfs: call mount.MakePrivate
Upstream-commit: b8cef7c19cea0f4ee670a9362154716b2313a18f
Component: engine
2016-06-30 11:14:30 -07:00
Keith Hudgins
ed6f72c122
Added HPE volume plugin listing
...
Signed-off-by: Keith Hudgins <greenman@greenman.org >
Upstream-commit: 87ef5b425472c442c9b79e018ee05b0724fdca8f
Component: engine
2016-06-30 14:13:54 -04:00
Vincent Demeester
36333fbd7e
Merge pull request #24175 from allencloud/fix-comments-and-handle-err
...
fix comments and handle err
Upstream-commit: cbc4fd2131d06c0342a330843a02632034f1db7b
Component: engine
2016-06-30 19:22:47 +02:00
Alexander Morozov
edfdc3750d
Merge pull request #24159 from yongtang/24090-docker-node-list-hostname
...
Use HOSTNAME in the output of `docker node ls`
Upstream-commit: 0f687aafafb1b3f3503e71e6a04e766cc85f4372
Component: engine
2016-06-30 09:28:57 -07:00
Vincent Demeester
5af62950c4
Merge pull request #24174 from runcom/fix-grammar
...
fix warn message typos
Upstream-commit: e84b91d8f5859778f43b03890e79b02610d82841
Component: engine
2016-06-30 17:05:06 +02:00
Vincent Demeester
9ea890bdf9
Merge pull request #24171 from allencloud/make-cmd-short-consistency
...
make cmd short consistency
Upstream-commit: 294791e9ed36eff4b93d6cec0da9ed3ed805d549
Component: engine
2016-06-30 16:59:32 +02:00
Yong Tang
a111812a86
Revendor golang.org/x/sys to remove golang.org/x/sys/unix
...
This fix tries to fix the issue raised in #24168 where
golang.org/x/sys causes s390x build failure.
This fix revendor golang.org/x/sys to removed the import
of "golang.org/x/sys/unix".
Note: The last commit removes the reference to
"golang.org/x/sys/unix".
This fix fixes #24168 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: ba39912a62edd237640dbdf6809d3fc14a2320c4
Component: engine
2016-06-30 06:55:21 -07:00
allencloud
24d57a19bb
fix comments and handle err
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: cc054f3195308da471c252d755dacfe446cb1066
Component: engine
2016-06-30 21:53:20 +08:00
Yong Tang
3aada352fd
Fix s390x build failure by removing golang.org/x/sys
...
This fix tries to fix the issue raised in #24168 where
golang.org/x/sys causes s390x build failure.
This fix removed the import of "golang.org/x/sys/unix".
This fix fixes #24168 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: f3d8658fffbf901845c937a40efa66a5b06cdfc3
Component: engine
2016-06-30 06:32:32 -07:00
Vincent Demeester
c89614146c
Merge pull request #24007 from LK4D4/fix_close_races
...
daemon/logger: fix races in channel close
Upstream-commit: e8439971b42a65dd831f80ec76a38e8c8e938cb6
Component: engine
2016-06-30 15:21:17 +02:00
allencloud
939b820305
make cmd short short consistency and change docs
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 184afb92bf0bda1f47b5e1812ee1134328e272e2
Component: engine
2016-06-30 21:17:51 +08:00
Antonio Murdaca
169947bdeb
fix warn message typos
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: a4143e6756d697323d560396dff6b90168a1e56c
Component: engine
2016-06-30 15:17:37 +02:00
Antonio Murdaca
cfcc34db47
Merge pull request #24164 from coolljt0725/remove_no_warn
...
Remove dm.no_warn_on_loop_devices in info warning
Upstream-commit: e275865a61c2c776bb2b1673d05bc2f6a8d72042
Component: engine
2016-06-30 15:16:05 +02:00
Vincent Demeester
a50f4824a7
Allow service and node filter to be name…
...
… on `docker node tasks` and `docker service tasks` commands.
This changes is mainly server-side (between engine api and
swarmkit). There is just a check in `api/client/service/tasks.go` to
handle the special *self* meaning.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b0fc5a21f1138f48e0431a550c936e8908d72840
Component: engine
2016-06-30 15:09:03 +02:00
Vincent Demeester
660ae2c902
Merge pull request #24149 from mavenugo/kn
...
Added missing flags for swarm-mode networks
Upstream-commit: cc024095c99edfec556bb2f5840279490fff4218
Component: engine
2016-06-30 12:23:45 +02:00
Wen Cheng Ma
2191f675ed
Fix docker stack link
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 93ed4b35fa6b35a24a79e3e4f9cfaea29982e7a4
Component: engine
2016-06-30 17:22:42 +08:00
Sebastiaan van Stijn
d4be296b2a
Merge pull request #24080 from dmcgowan/atomic-writer-mode
...
Set permission on atomic file write
Upstream-commit: cbf785c45a8cca061028ec341320bcbd655cf1fd
Component: engine
2016-06-30 01:00:08 -07:00
Lei Jitang
ac805da5d2
Remove dm.no_warn_on_loop_devices in info warning
...
I think we doesn't provide dm.no_warn_on_loop_devices option
at all. I didn't found any code to handle this option.
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 2aa01e0fbc76ecb8cf1a1b608e254e6cb8821ff7
Component: engine
2016-06-30 14:57:46 +08:00
Lei Jitang
ce55ac5368
Merge pull request #23974 from hopkings2008/devmapper_log
...
Add detail error logs when 'Unknown Device' error happens if devicema…
Upstream-commit: d2da1e3997c0d199c08c652c1285025415517f8d
Component: engine
2016-06-29 23:39:40 -07:00
yuzou
e667b026a1
Add detail error logs when 'Unknown Device' error happens if devicemapper storage is used.
...
Signed-off-by: yuzou <zouyu7@huawei.com >
Upstream-commit: d4a2bcc9ac49d07c71822ce72b97861d5844b46d
Component: engine
2016-06-30 13:06:14 +08:00
Yong Tang
8038d9fddd
Use HOSTNAME in the output of docker node ls
...
This fix tries to address an issue raised in #24090 where
the title field of `docker node ls` use NAME instead of
HOSTNAME. Yet the content of this field is actually
hostname.
The fix makes needed changes for the output of
`docker node ls`.
An additional test has been added to cover the change in
this fix.
This fix fixes #24090 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 4bc91ceeb750db6a6270b2f1821cb0b2f30117fc
Component: engine
2016-06-29 19:54:16 -07:00
Madhu Venugopal
3b186ee015
Fixed a few network UI issues in swarm-mode
...
* Detect name conflicts on network creation
* Detect and prevent network connect/disconnect for managed containers
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 0ce5158a2a9a3f10a62d3c1ea289c55e524cdac5
Component: engine
2016-06-29 18:08:55 -07:00
Tonis Tiigi
b9ac815dbd
Fix duplicate layers in exported tar
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 41bf7de73be5d35f40aca9eb68064aa3e8bb9a54
Component: engine
2016-06-29 18:06:42 -07:00
John Howard
37fb9cfa09
Windows: Ensure VolumePath is not set for Hyper-V containers
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: fd4f5c23650799a7e76e193614bf82454b375fe3
Component: engine
2016-06-29 16:49:09 -07:00
Ferran Rodenas
6e10fad8df
Syslog Driver: RFC 5425 Framing should be used only when protocol is TCP+TLS
...
Signed-off-by: Ferran Rodenas <frodenas@gmail.com >
Upstream-commit: 4039bfc917cc1e3d7c4dd8170152740bd3ac7d41
Component: engine
2016-06-29 15:41:10 -07:00
Madhu Venugopal
bd38c4db96
Added missing flags for swarm-mode networks
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: cf78863e9dc4e3480a7d1059ed306bdfd81cd3dc
Component: engine
2016-06-29 15:30:57 -07:00
Sebastiaan van Stijn
5113884470
Merge pull request #24144 from thaJeztah/update-api-docs
...
docs: add note that we no longer send container-id for exec
Upstream-commit: e904f58e199836fa43ee1c6736e689ef58e4fe10
Component: engine
2016-06-29 15:25:43 -07:00
Brian Goff
cadc295e94
Merge pull request #24135 from dnephin/fix_error_message
...
Fix mount opts error message
Upstream-commit: 55d9c49f920b4752337cee959cbc24b5d1b7ee5a
Component: engine
2016-06-29 17:19:00 -04:00
Alexander Morozov
29d2889a79
Merge pull request #23789 from tonistiigi/swarm-integration-tests
...
Update swarm integration tests and shutdown synchronization
Upstream-commit: 9162011680efa714788377651e51872bb852e2e3
Component: engine
2016-06-29 14:09:57 -07:00
Sebastiaan van Stijn
967277989f
Merge pull request #23949 from jstarks/fix_progress_on_load_compressed_layer
...
image: Report load progress on compressed layer size
Upstream-commit: a1fff2ca5afa15ae092668a06b55ae2dc4e039d7
Component: engine
2016-06-29 13:37:12 -07:00
Sebastiaan van Stijn
a6c4715a80
Merge pull request #24141 from thaJeztah/add-charles-as-docs-maintainer
...
Add Charles to docs maintainers
Upstream-commit: 511002f3080a3a52c0e75a193799700622a16124
Component: engine
2016-06-29 13:32:32 -07:00
Sebastiaan van Stijn
d648d9a308
docs: add note that we no longer send container-id for exec
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 82876c0f5b41fe4e3ee33e0bc77f2560b1a6535f
Component: engine
2016-06-29 13:30:09 -07:00
Nishant Totla
cddb6e635c
Updating header name and executor
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: af5df117a805c8df661c7efa58c57680019b5752
Component: engine
2016-06-29 13:26:19 -07:00
Sebastiaan van Stijn
429f89b0c8
Add Charles to docs maintainers
...
Charles is part of the docs team, so
adding him to the list here.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: b4163c1189c7389ddda32d9c4ec57708690434c8
Component: engine
2016-06-29 13:13:57 -07:00
Derek McGowan
6e93db8e82
Set permission on atomic file write
...
Perform chmod before rename with the atomic file writer.
Ensure writeErr is set on short write and file is removed on write error.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 1cd74902810b0eefddd173239cd95b506b34e678
Component: engine
2016-06-29 13:09:13 -07:00
Daniel Nephin
beffe0658c
Fix mount opts error message.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c8659d3cc501449a69a7e0b79994b42799750f29
Component: engine
2016-06-29 15:14:55 -04:00
Sebastiaan van Stijn
d4e14be148
Merge pull request #23955 from yongtang/23768-cpu-count
...
Fix wrong CPU count after CPU hot-plugging
Upstream-commit: 50a173e3d5ca8ed3b52c53fde6729188fc02e9e7
Component: engine
2016-06-29 12:00:13 -07:00
Vincent Demeester
8a1b995558
Merge pull request #23946 from dnephin/service-update-args
...
Fixes for `service update` of Args
Upstream-commit: 1e7ba55494eff0f38aa503b81576519b7b383644
Component: engine
2016-06-29 20:24:07 +02:00
Sebastiaan van Stijn
1535d36be1
Merge pull request #24071 from vdemeester/24063-empty-filtered-network-list
...
Return an empty network list if nothing matches filter
Upstream-commit: 27ceac2d74df385119fea2606a287d91a4123d82
Component: engine
2016-06-29 11:14:30 -07:00
Sebastiaan van Stijn
ec650aece5
Merge pull request #24028 from hqhq/fix_comments_in_aarch64
...
Fix comments in Dockerfile.aarch64
Upstream-commit: ccab57620e9b007a6fa4d462790fad004b62f9b2
Component: engine
2016-06-29 11:06:29 -07:00
Sebastiaan van Stijn
8de57b9a7b
Merge pull request #24069 from adamjk-dev/install_script_rhel_fix
...
Install script rhel fix
Upstream-commit: b9fc4ed664a8d504576af6e45a11dd55acd0a104
Component: engine
2016-06-29 11:04:55 -07:00
Adam Kunk
5bc8520da4
updates to fix install script for RHEL
...
fixing install script for rhel7
fixing install script for rhel7
Signed-off-by: Adam Kunk <adam.kunk@tiaa-cref.org >
updates to fix install script for RHEL
fixing install script for rhel7
fixing install script for rhel7
Signed-off-by: Adam Kunk <adam.kunk@tiaa-cref.org >
Upstream-commit: 485c27e18680f5eaeefe5de7f7916ba23f66c8f0
Component: engine
2016-06-29 13:51:27 -04:00