Sebastiaan van Stijn
b211e57f23
Merge pull request #20774 from hqhq/hq_vender_engine_api
...
Vendor engine-api to 70d266e96080e3c3d63c55a4d8659e00ac1f7e6c
2016-02-29 18:48:55 +01:00
John Howard
de6939817d
Windows CI: Unit Test turn off TestRemove
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-29 08:57:30 -08:00
Steven Iveson
244e5fc516
Update seccomp.md
...
Corrected titles to use title case. Added link to default.json and some numerical detail. Changed example JSON to a portion of the actual default file, with the correct defaultAction.
Signed-off-by: Steven Iveson <steven.iveson@infinityworks.com>
2016-02-29 16:32:45 +00:00
Vincent Demeester
c0c10daebf
Merge pull request #20777 from Anonymooseable/document-plugin-types
...
Document interfaces a plugin can implement
2016-02-29 17:31:06 +01:00
Tibor Vass
0573b814a1
Merge pull request #20737 from mikedougherty/install-sh-multiple-keyservers
...
Use multiple keyservers in install script
2016-02-29 11:17:13 -05:00
Linus Heckemann
3ef1325828
Remove experimental GraphDriver plugin type
...
Signed-off-by: Linus Heckemann <anonymouse2048@gmail.com>
2016-02-29 15:59:54 +00:00
Vincent Demeester
6c01d2a0cf
Merge pull request #20629 from wallnerryan/intro-volumes
...
Intro volume drivers in dockervolumes.md
2016-02-29 16:59:43 +01:00
Ryan Wallner
b6fdcd3a34
intro volume plugins in userguide volumes
...
NOTE should be lowercase
Signed-off-by: Ryan Wallner <ryan.wallner@clusterhq.com>
add link to list of plugins
Signed-off-by: Ryan Wallner <ryan.wallner@clusterhq.com>
address changres
Signed-off-by: Ryan Wallner <ryan.wallner@clusterhq.com>
2016-02-29 10:56:32 -05:00
Tibor Vass
eb22fcc229
Merge pull request #20773 from Microsoft/jjh/testunitdockerlayer
...
Windows CI Unit Test: Docker layer turn off failing tests
2016-02-29 10:46:32 -05:00
Tibor Vass
8ffec1fca5
Merge pull request #20772 from Microsoft/jjh/testunitdistribution-xfer
...
Windows CI Unit Test: Distribution\xfer turn off failing tests
2016-02-29 10:45:57 -05:00
Brian Goff
abbb16d7ab
Merge pull request #20602 from twistlock/20508_authz_plugin_corrupt_body
...
Fix #20508 - Authz plugin enabled with large text/JSON POST payload corrupts body
2016-02-29 10:43:02 -05:00
Antonio Murdaca
0e9769ab62
container: container_unix: remove unused func
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-02-29 16:12:02 +01:00
Brian Goff
7cea7c698d
Merge pull request #20756 from runcom/no-dash-d-tests
...
integration-cli: remove not necessary -d again
2016-02-29 09:47:49 -05:00
Phil Estes
7a61b9ae42
Fix ownership of non-existing parent dir
...
During "COPY" or other tar unpack operations, a target/destination
parent dir might not exist and should be created with ownership of the
root in the right context (including remapped root when user namespaces
are enabled)
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2016-02-29 09:14:23 -05:00
Vincent Demeester
79c24a0820
Merge pull request #20736 from elchris82/master
...
Changed the Example request in Remote API reference to connect a container to a network
2016-02-29 15:06:20 +01:00
Antonio Murdaca
565712014f
cliconfig: use a const for ".docker" string
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-02-29 14:44:01 +01:00
Antonio Murdaca
863b571617
Revert "resolve the config file from the sudo user"
...
This reverts commit afde6450ee
.
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-02-29 13:51:43 +01:00
Sebastiaan van Stijn
da4f2ce629
Merge pull request #20771 from Microsoft/jjh/disableunittestsdistribution
...
Windows CI Unit Test: Distribution turn off failing tests
2016-02-29 12:56:10 +01:00
Qiang Huang
53b0d62683
Vendor engine-api to 70d266e96080e3c3d63c55a4d8659e00ac1f7e6c
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-02-29 19:28:37 +08:00
Linus Heckemann
dd729efe02
Document interfaces a plugin can implement
...
Signed-off-by: Linus Heckemann <lheckemann@twig-world.com>
2016-02-29 09:43:44 +00:00
Vincent Demeester
ffd8a0e0fb
Merge pull request #20776 from terryding77/doc_changes
...
change container word spell in docs
2016-02-29 10:38:06 +01:00
terryding77
adda1060aa
change container word spell in docs
...
Signed-off-by: terryding77 <550147740@qq.com>
2016-02-29 16:59:53 +08:00
Antonio Murdaca
5ef74c6595
Merge pull request #20753 from icecrime/debugging_win2lin
...
Fix client-side race in `docker stats`
2016-02-29 08:20:17 +01:00
Vincent Demeester
20a038eca6
Merge pull request #20604 from coolljt0725/fix_reload
...
Fix configuration reloading
2016-02-29 07:14:15 +01:00
John Howard
e17cb9b721
Windows CI Unit Test: Docker layer turn off failing tests
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-28 20:16:10 -08:00
John Howard
dd2ff281bf
Windows CI Unit Test: Distribution\xfer turn off failing tests
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-28 20:08:34 -08:00
John Howard
621a1b9aca
Windows CI Unit Test: Distribution turn off failing tests
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-28 20:02:51 -08:00
Arnaud Porterie
3041aa53ef
Fix client-side race in docker stats
...
Subscribe to events and monitor for new containers before the initial
listing of currently running containers.
This fixes a race where a new container could appear between the first
list call but before the client was subscribed to events, leading to a
container never appearing in the output of `docker stats`.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-02-28 18:44:23 -08:00
Sebastiaan van Stijn
67a77934a4
Merge pull request #20760 from vdemeester/fix-cliconfig
...
Fixing cliconfig getDefaultConfigDir
2016-02-29 00:19:06 +01:00
Sebastiaan van Stijn
ab18b5977a
Merge pull request #20757 from spacediver/patch-1
...
fixed formatting; added handy -y to apt-get install
2016-02-28 23:55:03 +01:00
Sebastiaan van Stijn
0866d63278
Merge pull request #20759 from toogley/master
...
add google group subscribtion method using only emails
2016-02-28 19:17:00 +01:00
Pavel Sutyrin
30c2770a73
fixed formatting; added handy -y to apt-get install
...
Signed-off-by: Pavel Sutyrin <pavel.sutyrin@gmail.com>
2016-02-28 20:37:04 +03:00
Vincent Demeester
d3fd0974d5
Fixing getDefaultConfigDir
...
It seems it's not really checking the right folder.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-02-28 16:04:48 +01:00
toogley
e3e18584b0
add google group subscribtion method using only emails
...
* users don't have to create an google account for using the google groups. They
can simply email to e.g. "docker-user+subscribe@googlegroups.com" to
subscribe.
* since this behavior is not mentioned on the google group website, i think its
a good idea to explain this method here.
Signed-off-by: toogley <toogley@mailbox.org>
2016-02-28 15:31:15 +01:00
Antonio Murdaca
e44689139d
integration-cli: remove not necessary -d again
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-02-28 13:48:15 +01:00
Brian Goff
38439733d2
Merge pull request #20748 from runcom/remove-dash-d
...
integration-cli: remove not necessary -d
2016-02-27 21:58:15 -05:00
Brian Goff
ec268be52e
Merge pull request #20706 from calavera/remove_concurrent_access_to_stdtypes
...
Make stdcopy.StdWriter thread safe.
2016-02-27 21:14:09 -05:00
Arnaud Porterie
15bdca6add
Merge pull request #20752 from icecrime/fix_experimental_cross
...
Pin tpoechtrager/osxcross commit
2016-02-27 17:43:43 -08:00
Arnaud Porterie
2140650b56
Pin tpoechtrager/osxcross commit
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-02-27 12:04:49 -08:00
Shijiang Wei
7285c9a53a
validate log-opt when creating containers
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2016-02-28 01:51:46 +08:00
Antonio Murdaca
faf4604dac
integration-cli: remove not necessary -d
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-02-27 18:27:25 +01:00
Arnaud Porterie
c7d6f0c30c
Merge pull request #20742 from cpuguy83/revert_aufs_fine_locks
...
Revert aufs fine locks
2016-02-27 08:53:04 -08:00
Arnaud Porterie
c24d4e8ab4
Merge pull request #20734 from cpuguy83/fix_flakey_test
...
Fix flakey TestStatsAllNewContainersAdded
2016-02-27 07:52:18 -08:00
Brian Goff
e386dfc33f
fix double-lock
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-02-27 09:49:21 -05:00
Vincent Demeester
3f4e49aa61
Merge pull request #20739 from LK4D4/keys_config
...
Add CONFIG_KEYS to check-config.sh
2016-02-27 14:33:54 +01:00
Brian Goff
c2f7777603
Revert "Add finer-grained locking for aufs"
...
This reverts commit f31014197c
.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-02-27 08:01:19 -05:00
HuKeping
1a68662736
Messaging both succeed and failure about the signing
...
It would be good to add a clearer failure or succeed message.
Signed-off-by: Hu Keping <hukeping@huawei.com>
2016-02-27 15:46:41 +08:00
HuKeping
5dddf7e98e
Refactor trust push
...
Unlike the untrusted push without an explicit tag will push all
tags for that repo, the trusted push would expect an explicit tag.
So that the code that attempts to do smart logic around signing multiple
tags should be removed.
Signed-off-by: Hu Keping <hukeping@huawei.com>
2016-02-27 15:46:35 +08:00
Alexander Morozov
c1996c9245
Add CONFIG_KEYS to check-config.sh
...
We need this after opencontainers/runc#488
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-02-26 23:40:35 -08:00
Clinton Kitson
799ae78b7e
Fixes plugin file descriptor leak on plugin discovery
...
Signed-off-by: Clinton Kitson <clintonskitson@gmail.com>
2016-02-26 19:43:50 -08:00