daced1d303
Add support for DOCKER_CONFIG/--config to specific config file dir
...
Carry #11675
Aside from what #11675 says, to me a key usecase for this is to support
more than one Docker cli running at the same time but each may have its
own set of config files.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-07-10 12:51:34 -07:00
0afd7bde02
Merge pull request #14381 from Mashimiao/cleanup-client-unused-code
...
api/client: unify format of args check
2015-07-09 06:42:57 -04:00
f0e90606cd
Merge pull request #13989 from squaremo/netplugin_docs
...
Mention network driver plugins and point to protocol docs
2015-07-09 09:27:05 +02:00
ca3e4ccb80
Merge pull request #14241 from ZJU-SEL/fix-ulimit-usage
...
Fix ulimit usage of nproc
2015-07-09 08:23:26 +02:00
54ac3ad736
Clarify that nproc is not for per container
...
Fix ulimit nproc spec in daemon
Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn>
2015-07-09 02:40:47 +00:00
cab02a5bbc
Merge pull request #14456 from Djelibeybi/issue14042
...
Remove RPM specific dependencies
2015-07-08 17:17:55 -07:00
885e7f2a1e
Merge pull request #14479 from LK4D4/fix_test_inspect
...
Remove prefix dots from inspects in tests
2015-07-08 15:10:51 -07:00
2df65c32d7
Merge pull request #14402 from mrjana/mh
...
Vendoring libnetwork
2015-07-08 17:15:13 -04:00
67058e388b
Remove prefix dots from inspects in tests
...
Dots prepended to key in inspectField function
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-07-08 12:41:05 -07:00
42eb82ae92
Merge pull request #14477 from Microsoft/10662-runconfig-oopsie
...
Windows: Wrong build tag in runconfig
2015-07-08 15:34:05 -04:00
2f566f747b
Merge pull request #14459 from lexandro/add-dockery-to-client-libs
...
Adding dockery as client lib to the docs
2015-07-08 20:52:24 +02:00
4cd9301692
Windows: Wrong build tag in runconfig
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-07-08 11:38:28 -07:00
3833c990e7
Merge pull request #14471 from icecrime/14451_devmapper_startup_panic
...
Fix panic on devicemapper initialization
2015-07-08 11:18:00 -06:00
f089899023
Fix panic on devicemapper initialization
...
The ability to save and verify base device UUID (#13896 ) introduced a
situation where the initialization would panic when removing the device
returns EBUSY.
Functions `verifyBaseDeviceUUID` and `saveBaseDeviceUUID` now take the
lock on the `DeviceSet`, which solves the problem as `removeDevice`
assumes it owns the lock.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-07-08 09:10:20 -07:00
cd454fef5a
Adding dockery as client lib to the docs
...
Signed-off-by: Robert Stern <lexandro2000@gmail.com>
2015-07-08 12:09:34 +02:00
9a4cbb358d
api/client: unify format of args check
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-07-08 17:29:47 +08:00
e3b5889783
Remove specific dependencies and let RPM auto-generate the dependencies on libraries during build.
...
Signed-off-by: Avi Miller <avi.miller@oracle.com>
2015-07-08 15:30:42 +10:00
f5ebcfe1dc
Merge pull request #14429 from coolljt0725/fix_cp_created_container
...
Fix copy from a "created" container. Fixes #14420
2015-07-07 22:27:01 -06:00
159e830068
Merge pull request #14379 from Mashimiao/add-missing-stream-close
...
api/client: close the returned io.ReadCloser
2015-07-07 21:15:45 -06:00
289ee90b04
Fix copy from a "created" container. Fixes #14420
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-07-08 11:15:09 +08:00
91a496055c
api/client: close the returned io.ReadCloser
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-07-08 10:06:25 +08:00
2fe51ecee7
Merge pull request #14100 from rhvgoyal/overlay-docker-inspect
...
overlay: Export metadata for container and image in docker-inspect
2015-07-07 18:11:27 -07:00
9c96304a86
Merge pull request #14315 from Pensu/14176-fix-run-table-rendering
...
Fixing the table rendering in reference/run.md
2015-07-07 18:09:53 -07:00
2cd417df73
Merge pull request #14388 from runcom/14316-fix-events-filters
...
Fix combined image events filters
2015-07-07 18:08:56 -07:00
25151eb24e
Merge pull request #14417 from crosbymichael/attach-stdin
...
Always attach STDIN if -i,--interactive is specified
2015-07-07 18:07:46 -07:00
045ccc4326
Merge pull request #14432 from coolljt0725/umount_rootf_on_cp_fail
...
Always umount container rootfs and volumes on docker cp failed
2015-07-07 21:04:16 -04:00
81c30c3303
Merge pull request #14430 from zmarouf/master
...
fix(docs): Small typoes in the Supported installation page
2015-07-07 18:00:19 -07:00
16f8afb451
Merge pull request #14369 from maximkulkin/14123-dockerize-disk-with-non-en-locale
...
Fix dockerize-disk.sh working in non-en locale
2015-07-07 17:51:29 -07:00
e13b7862ab
Merge pull request #14335 from konstruktoid/issue_14263
...
Mention experimental build
2015-07-07 17:49:37 -07:00
806b3fa145
Merge pull request #13835 from cpuguy83/gen-prc
...
generate plugin clients via template
2015-07-07 17:17:39 -07:00
a5283d2ff3
Merge pull request #13866 from brahmaroutu/runOOM_13766
...
RunOOM test should check to see if Oom Control is enabled
2015-07-07 16:21:46 -07:00
b2b367a6ad
Merge pull request #14427 from Evalle/14404-add-Metatag
...
Adding Group Metatag
2015-07-07 16:43:20 -06:00
f7ea9114d6
Merge pull request #14415 from calavera/warning_on_no_dev_sync
...
Put dm.override_udev_sync_check back.
2015-07-07 14:35:49 -07:00
e27131519f
Warn when udev_sync is not supported.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-07-07 15:10:24 -06:00
e3966c1031
Merge pull request #14380 from sunyuan3/TestRunCapAddCHOWN
...
add TestRunCapAddCHOWN test case
2015-07-07 12:36:14 -07:00
9af7afb9eb
Revert "Fix implicit DeviceMapper selection"
...
This reverts commit 0a376291b2
2015-07-07 12:27:19 -07:00
a14b1f1e9d
Merge pull request #14441 from embray/patch-1
...
Update windows.md
2015-07-07 15:14:37 -04:00
a8f8748f7a
Merge pull request #14398 from ankushagarwal/gitignore-iml
...
Removing .idea from .gitignore
2015-07-07 12:10:54 -07:00
bfc5966d0b
Merge pull request #14094 from rghv/master
...
Added entries of a few ancient Indian mathematicians who did cool things centuries ago.
2015-07-07 12:03:28 -07:00
2ea4d90da4
Merge pull request #14422 from Microsoft/10662-dumpstacks
...
Windows: Win32 event for sigusr1 linux equivalence
2015-07-07 10:54:00 -07:00
12c85f3671
Update windows.md
...
With apologies (it wasn't clear from the contributing guidelines how this project feels about PRs for one or two word doc fixes).
Signed-off-by: Erik M. Bray <erik.m.bray@gmail.com>
2015-07-07 13:51:17 -04:00
cd72c7f3bb
Merge pull request #14421 from dmcgowan/fix-duplicate-layers
...
Fix duplicate layers in manifest
2015-07-07 10:50:45 -07:00
10bbf62081
Merge pull request #14375 from coolljt0725/fix_test_events_default_empty
...
Fix test TestEventsDefaultEmpty. Fixes #14360
2015-07-07 10:37:40 -04:00
833cdd28ed
Merge pull request #14307 from kolyshkin/readme-fixes
...
README.md: fix cgroups/namespaces name and link
2015-07-07 06:09:20 -07:00
61418e39d5
Merge pull request #14428 from sunyuan3/TestPushBusyboxImage
...
Correct wrong comment of TestPushBusyboxImage.
2015-07-07 14:44:08 +02:00
13c36ce65e
Always umount container rootfs and volumes on docker cp failed
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-07-07 20:27:45 +08:00
3bee3a2927
fix(docs): Small typoes in the Supported installation page
...
-> https://docs.docker.com/installation/
Signed-off-by: Zeid Marouf <zeid.marouf@gmail.com>
2015-07-07 11:09:12 +02:00
f244ed2531
Correct wrong comment of TestPushBusyboxImage.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-07-07 16:10:37 +08:00
270d7e1af8
Merge pull request #14406 from duglin/tweakCmdlineHelp
...
Fix example in cmdline help text to have correct output
2015-07-07 09:26:13 +02:00
244141a8aa
Merge pull request #13987 from larsks/bug/7583
...
Update docker commit man page re: volumes
2015-07-07 09:16:54 +02:00
Doug Davis
Doug Davis
Sebastiaan van Stijn
Harry Zhang
Jessie Frazelle
Phil Estes
Alexander Morozov
Brian Goff
John Howard
David Calavera
Arnaud Porterie
Robert Stern
Ma Shimiao
Avi Miller
Alexander Morozov
Lei Jitang
Michael Crosby
James Turnbull
Erik Bray
moxiegirl
Antonio Murdaca
zmarouf
Yuan Sun