Alexandre Beslic
14108ccaa1
Merge pull request #517 from gegere/readme/update
...
Adding additional notes for installing Go via Homebrew on Mac OS X
2015-04-08 02:11:34 -07:00
Felix Schindler
8afd5cad31
Fixing typo.
...
Added missing white space.
Signed-off-by: Felix Schindler <fschindler@weluse.de >
2015-04-08 11:03:11 +02:00
Deshi Xiao
a40f379878
fixed #11500 Add tip about filter proxy
...
fixed #11500
Add tip about filter proxy to Docker installation Guides
Signed-off-by: Deshi Xiao <xiaods@gmail.com >
2015-04-08 14:13:01 +08:00
Yuan Sun
cc30282e94
duplicate logDone in TestRenameRunningContainer and TestRenameCheckNames
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-04-08 13:33:05 +08:00
Stephen Day
5a4f66b2f8
Merge pull request #334 from BrianBland/configOmitEmpty
...
Adds omitempty to several configuration fields
2015-04-07 20:02:29 -07:00
Jason Gegere
b45518c14b
Adding additional notes for installing Go via Homebrew on Mac OS X
...
Signed-off-by: Jason Gegere <jason@hgmail.com >
2015-04-07 20:37:23 -06:00
Andrea Luzzardi
758612896d
Merge pull request #584 from noxiouz/remove_extra_rlock
...
[SwarmCluster] Remove extra RLock in node.Container
2015-04-07 19:01:08 -07:00
Brian Goff
24057777af
Remove duplicate config file creation.
...
When `toDisk` is called, it is creating a file already, no need to
create it here.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-07 21:36:30 -04:00
Jeffrey Morgan
5a0fd8db61
removing circle.yml
2015-04-07 21:13:27 -04:00
Jeffrey Morgan
159ea8013f
Merge branch 'master' into jeffdm-windows
...
Conflicts:
README.md
2015-04-07 21:01:53 -04:00
wlan0
ee941e979b
make ssh username configurable for ec2
...
Signed-off-by: wlan0 <sidharthamn@gmail.com >
2015-04-07 18:00:06 -07:00
Brian Bland
5955c73db7
Adds omitempty to several configuration fields
...
Includes deprecated Loglevel, Log.Formatter, and Log.Fields
2015-04-07 17:54:18 -07:00
David Lawrence
2096a423bd
fleshing out the interfaces some more
2015-04-07 17:18:01 -07:00
Olivier Gambier
5fe1039947
Merge pull request #332 from stevvooe/case-sensitive-backend
...
registry/storage/driver: defer case-sensitive support to storage backend
2015-04-07 16:24:38 -07:00
David Lawrence
5f7e002a9a
scaffolding for error, handler and context setup
2015-04-07 16:22:16 -07:00
Michael Crosby
06433cf812
Merge pull request #12161 from LK4D4/update_libcontainer
...
Update libcontainer
2015-04-07 16:18:33 -07:00
Jessie Frazelle
d08db9a059
Merge pull request #12160 from mrunalp/remove_unused
...
Removes unused function.
2015-04-07 16:05:49 -07:00
Alexander Morozov
ce69dafe4d
Test case for network mode chain container -> container -> host
...
Issue #12130
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-07 15:20:42 -07:00
Mrunal Patel
195bebd3a7
Removes unused function.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
2015-04-07 18:15:28 -04:00
Tibor Vass
dccda72a41
Merge pull request #12120 from LK4D4/split_attach
...
Remove engine usage from attach
2015-04-07 18:13:35 -04:00
Alexander Morozov
2f853b9493
Update libcontainer to bd8ec36106086f72b66e1be85a81202b93503e44
...
Fix #12130
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-07 15:10:44 -07:00
moxiegirl
8b71930570
Merge pull request #12154 from moxiegirl/carry-pr-11409
...
Carrying 11409 for a contributor
2015-04-07 15:00:26 -07:00
Alexander Morozov
d1423d28b5
Merge pull request #12155 from kostickm/12146-fix-fail-msg-TestRunDeviceDirectory
...
Fixing fail message in TestRunDeviceDirectory
2015-04-07 14:55:30 -07:00
moxiegirl
65ca20e6f1
Merge pull request #12156 from moxiegirl/pr-12008-carry
...
Carry PR 12008 for contributor
2015-04-07 14:54:02 -07:00
Anton Tiurin
e66abdf7bb
[SwarmCluster] Remove an extra RLock in Engine.Container
...
Engine.Container uses an array of containers from Engine.Containers, which is
built under an internal RLock, so the external RLock is useless.
Also allocate enough memory for the array of containers (images).
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru >
2015-04-08 00:41:28 +03:00
Victor Vieux
3cf6cde494
Merge branch 'jangelfdez-patch'
2015-04-07 14:36:57 -07:00
jangelfdez
17b9b96b33
Doc changed to avoid errors with POST calls to Docker Hub Discovery Service API
...
The data on the "Add new nodes to a cluster" request may be confusing. It's not a key=value pair as it can be understood with the current docs.
Signed-off-by: jangelfdez <me@joseangelfernandez.es >
2015-04-07 14:36:07 -07:00
Alexander Morozov
c44f513248
Remove engine usage from attach
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-07 14:23:09 -07:00
Alexander Morozov
8fd2b52146
Fix fail message in TestEventsImageImport
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-07 14:22:43 -07:00
Stephen J Day
e23ca5ac5f
Defer case-sensitive support to storage backend
...
Rather than enforce lowercase paths for all drivers, support for
case-sensitivity has been deferred to the driver. There are a few caveats to
this approach:
1. There are possible security implications for tags that only differ in their
case. For instance, a tag "A" may be equivalent to tag "a" on certain file
system backends.
2. All system paths should not use case-sensitive identifiers where possible.
This might be problematic in a blob store that uses case-sensitive ids. For
now, since digest hex ids are all case-insensitive, this will not be an issue.
The recommend workaround is to not run the registry on a case-insensitive
filesystem driver in security sensitive applications.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-04-07 14:14:45 -07:00
Andrea Luzzardi
530d5670a4
Merge pull request #574 from vieux/node_engine
...
Transform `node interface` to `engine struct`
2015-04-07 14:11:58 -07:00
Mary Anthony
87e70b6831
Carry PR 12008 for contributor
...
Closes #8040
Remove a tic for the hawk
Signed-off-by: Mary Anthony <mary@docker.com >
2015-04-07 14:09:53 -07:00
Tibor Vass
9dd23be563
Merge pull request #11947 from TonnyXu/master
...
Updated the explanation of ONBUILD in best-practices doc
2015-04-07 16:53:43 -04:00
Alexandre Beslic
8590a1c69a
Merge pull request #586 from jimmyxian/attach-ws
...
Implement docker attach-ws api
2015-04-07 13:48:14 -07:00
moxiegirl
4d4f201a4d
Merge pull request #12089 from nerdalert/doc-fix-netw-nerdalert
...
Replaced level with layer for OSI model references
2015-04-07 13:29:40 -07:00
Jessie Frazelle
ebd7df3bbe
Merge pull request #11909 from runcom/11908-refactor-utils-utils-daemon
...
Refactor utils/utils_daemon
2015-04-07 13:24:24 -07:00
Mary Anthony
fdfc36db41
Carrying 11409 for a client
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-04-07 13:20:17 -07:00
Megan Kostick
05dcf26199
Fixing fail message in TestRunDeviceDirectory
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
2015-04-07 13:14:47 -07:00
Jeffrey Morgan
a5b003b381
Adding pull container feature
2015-04-07 16:06:08 -04:00
Xian Chaobo
71cbef03dc
update README.md
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-04-08 03:50:23 +08:00
Vincent Batts
86d66d6273
Merge pull request #12033 from rhvgoyal/devmapper-cleanup
...
Devmapper Graph Driver Misc cleanup
2015-04-07 15:49:32 -04:00
Xian Chaobo
18f1095e7e
implement attach-ws api
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-04-08 03:48:58 +08:00
Jeffrey Morgan
9776f44d2c
Merge pull request #364 from koddsson/master-fix-key-warning
...
Fall-back to image name as key when there is no id
2015-04-07 14:51:20 -04:00
Victor Vieux
853aaf6027
nodes -> engines
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-04-07 11:46:33 -07:00
Victor Vieux
fa10490af8
Merge branch 'sunyc-ignore_comment'
2015-04-07 10:41:25 -07:00
Victor Vieux
5e41510484
udpate tests
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-04-07 10:41:18 -07:00
Phil Estes
e011119a49
Merge pull request #12129 from duglin/RemoveTable5
...
Remove engine.Table from more daemon side stuff
2015-04-07 12:53:55 -04:00
moxiegirl
531d2b3b80
Merge pull request #12136 from YanFeng-Adam/typo
...
Fix 2 typos in /doc/sources/reference/run.md
2015-04-07 09:21:01 -07:00
Yan Feng
805f34bb5b
Fix 2 typos in /doc/sources/reference/run.md
...
Signed-off-by: Yan Feng <yanfeng2@huawei.com >
2015-04-07 14:15:05 -04:00
Alexander Morozov
d487ca03e6
Remove events package
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-07 08:43:18 -07:00