Mary Anthony
29e895a1b0
Updating text of installer
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-07-07 18:48:38 -07:00
Jessie Frazelle
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
Jessie Frazelle
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
Jessie Frazelle
2cd417df73
Merge pull request #14388 from runcom/14316-fix-events-filters
...
Fix combined image events filters
2015-07-07 18:08:56 -07:00
Jessie Frazelle
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
Brian Goff
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
Jessie Frazelle
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
Jessie Frazelle
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
Jessie Frazelle
e13b7862ab
Merge pull request #14335 from konstruktoid/issue_14263
...
Mention experimental build
2015-07-07 17:49:37 -07:00
Michael Crosby
806b3fa145
Merge pull request #13835 from cpuguy83/gen-prc
...
generate plugin clients via template
2015-07-07 17:17:39 -07:00
Jeffrey Morgan
673056368a
Adding windows
2015-07-07 17:16:43 -07:00
Michael Crosby
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
Evan Hazlett
0dc1d417ac
Merge pull request #1487 from nathanleclaire/fix_paused_start
...
Fix choke when starting from Saved state
2015-07-07 16:54:19 -06:00
David Calavera
b2b367a6ad
Merge pull request #14427 from Evalle/14404-add-Metatag
...
Adding Group Metatag
2015-07-07 16:43:20 -06:00
Nathan LeClaire
9053ee24c7
Fix choke when starting from Saved state
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-07-07 14:36:21 -07:00
Arnaud Porterie
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
Michael Chiang
e4c456d595
Roadmap init.
...
blank of roadmap.
2015-07-07 14:31:39 -07:00
Victor Vieux
0d7dd1ad6f
don't use PORTS
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-07-07 14:18:37 -07:00
David Calavera
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
Victor Vieux
82d3d64b7e
update a test to use 2 slaves
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-07-07 13:37:33 -07:00
Victor Vieux
5a39d21707
use random port in mesos tests
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-07-07 13:37:33 -07:00
Victor Vieux
49d475228e
use docker_port from offer is present
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-07-07 13:37:33 -07:00
Victor Vieux
b18b5bf9f7
add mesos tests back
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-07-07 13:27:40 -07:00
Arnaud Porterie
e3966c1031
Merge pull request #14380 from sunyuan3/TestRunCapAddCHOWN
...
add TestRunCapAddCHOWN test case
2015-07-07 12:36:14 -07:00
David Calavera
9af7afb9eb
Revert "Fix implicit DeviceMapper selection"
...
This reverts commit 0a376291b2 .
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-07 12:27:19 -07:00
James Turnbull
a14b1f1e9d
Merge pull request #14441 from embray/patch-1
...
Update windows.md
2015-07-07 15:14:37 -04:00
Roman Strashkin
cc955ae73c
added ability to iterate over all indexes and use index.Iterate() instead of ReadDir() to walk over the graph
...
Signed-off-by: Roman Strashkin <roman.strashkin@gmail.com >
2015-07-07 22:13:28 +03:00
Michael Crosby
a8f8748f7a
Merge pull request #14398 from ankushagarwal/gitignore-iml
...
Removing .idea from .gitignore
2015-07-07 12:10:54 -07:00
Michael Crosby
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
Derek McGowan
0f5f340d0c
Fix default log level
...
Work around bug in viper configuration.
Viper will always use the default since it matches the whole key match first.
Setting the default to a map keeps the config file as the first matched item.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-07-07 11:55:49 -07:00
Victor Vieux
7e4a457a9a
Merge pull request #1036 from Pensu/fix-simple-spelling
...
Fixing spelling of again
2015-07-07 11:48:51 -07:00
Nathan LeClaire
83a8a4c0f8
Merge pull request #1310 from exoscale/feature/exoscale-multiple-security-groups
...
exoscale: ability to specify multiple security groups on instance creation
2015-07-07 11:22:44 -07:00
Vivek Goyal
bebf534439
devicemapper: Check loop devices of existing pool
...
Often it happens that docker is not able to shutdown/remove the thin
pool it created because some device has leaked into some mount name
space. That means device is in use and that means pool can't be removed.
Docker will leave pool as it is and exit. Later when user starts the
docker, it finds pool is already there and docker uses it. But docker
does not know it is same pool which is using the loop devices. Now
docker thinks loop devices are not being used. That means it does not
display the data correctly in "docker info", giving user wrong information.
This patch tries to detect if loop devices as created by docker are
being used for pool and fills in the right details in "docker info".
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-07-07 14:13:29 -04:00
Arnaud Porterie
2ea4d90da4
Merge pull request #14422 from Microsoft/10662-dumpstacks
...
Windows: Win32 event for sigusr1 linux equivalence
2015-07-07 10:54:00 -07:00
Erik Bray
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
Michael Crosby
cd72c7f3bb
Merge pull request #14421 from dmcgowan/fix-duplicate-layers
...
Fix duplicate layers in manifest
2015-07-07 10:50:45 -07:00
Aanand Prasad
a8ad13734e
Merge pull request #1666 from mnowster/docs-for-extends-file-default-behaviour
...
Docs for `file` default behaviour
2015-07-07 17:12:29 +01:00
Aanand Prasad
8b033d3946
Merge pull request #1665 from mnowster/1648-support-log-opt
...
1648 support log opt
2015-07-07 17:08:04 +01:00
Mazz Mosley
ef8ae07145
Docs for file default behaviour
...
Change in behaviour, `file` key is optional and if not set the
default is to look within the same file as `extends` is defined.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com >
2015-07-07 17:01:09 +01:00
Victor Vieux
d7c11fab16
update mesos-go
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-07-07 08:35:47 -07:00
Mazz Mosley
6f31e8ebe9
Add support for log_opt
...
When specifying a log_driver you want to specify some options for
the logger as per the docker run --log-opt option. The logger
options are key value pairs.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com >
2015-07-07 16:26:43 +01:00
Dave Henderson
3d002187fe
Refactoring drivers to embed drivers.DefaultDriver
...
Signed-off-by: Dave Henderson <dhenderson@gmail.com >
2015-07-07 11:24:00 -04:00
Aanand Prasad
2bc10db545
Merge pull request #1658 from aanand/fix-smart-recreate-nonexistent-image
...
Fix smart recreate when 'image' is changed to something nonexistent
2015-07-07 16:12:44 +01:00
Aanand Prasad
531265bc84
Fix smart recreate when 'image' is changed to something nonexistent
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-07-07 16:01:44 +01:00
Brian Goff
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
moxiegirl
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
Antonio Murdaca
61418e39d5
Merge pull request #14428 from sunyuan3/TestPushBusyboxImage
...
Correct wrong comment of TestPushBusyboxImage.
2015-07-07 14:44:08 +02:00
Lei Jitang
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
Mazz Mosley
c1223bfd3a
Keep config keys in alphabetised order
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com >
2015-07-07 12:02:05 +01:00
Xian Chaobo
402053fa00
fix #927 check pull status code
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-07-07 17:41:12 +08:00