0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
20016 commits 14 branches 412 tags 338 MiB
Commit graph

20016 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alexander Morozov
71f422435e Merge pull request #17999 from tianon/linkmode-external 
Remove "-linkmode external"
 2015-11-17 08:33:32 -08:00
Jess Frazelle
1c8d8b3012 Merge pull request #17803 from hypriot/17802-add-initial-support-for-docker-on-arm 
Add initial support for Docker on ARM
 2015-11-17 16:52:54 +01:00
David Calavera
d507acb175 Merge pull request #17724 from runcom/remove-depreciated-cli-flags 
Remove depreciated cli flags
 2015-11-17 16:40:06 +01:00
GoBella
c16dd88c5e "Assert change" 
Signed-off-by: GoBella <caili_welcome@163.com>
 2015-11-17 18:40:18 +08:00
David Calavera
af9757576c Merge pull request #17556 from donhcd/testForStatsVersioning 
Test for stats versioning
 2015-11-17 11:19:34 +01:00
David Calavera
6f1bc096a6 Merge pull request #18025 from Microsoft/10662-ArgumentEscaping 
Windows: Fix docker exec
 2015-11-17 11:14:54 +01:00
David Calavera
a2d87d14ac Merge pull request #18037 from dm4/fix-aufs-markdown-syntax 
Fix Markdown syntax error in aufs-driver.md
 2015-11-17 11:13:01 +01:00
Lee, Meng-Han
ea04764059 Fix Markdown syntax error in aufs-driver 
Signed-off-by: dm4 <dm4@skymizer.com>
 2015-11-17 17:38:36 +08:00
David Calavera
b665730d2c Make NormalizeLocalName to not reach the network to normalize names. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-11-17 03:31:32 -05:00
Trevor Pounds
a25988cf76 Fix typo when --expose and --net are specified. 
Signed-off-by: Trevor Pounds <trevor.pounds@gmail.com>
 2015-11-16 22:01:20 -08:00
Alexander Morozov
81aa1b507f Remove cgroups mounting in dind 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-11-16 17:10:53 -08:00
Tibor Vass
ef424c108a Merge pull request #17988 from Microsoft/jjh/pushv2 
Windows [TP4] Fix push to not kill daemon
 2015-11-17 01:28:34 +01:00
Alexander Morozov
292a15e40a Use /usr/lib/os-release if /etc/os-release is missing. 
As per os-release spec, /usr/lib/os-release file should be tried if
/etc/os-release is missing.

http://www.freedesktop.org/software/systemd/man/os-release.html

Thanks James Hunt <james.o.hunt@intel.com> and
Dimitri John Ledkov <dimitri.j.ledkov@intel.com> for contribution.

Close #17174

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-11-16 16:21:31 -08:00
Alexander Morozov
25b37e2f04 graph/graph.go: simplify appending to slice in map in byParent 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-11-16 12:02:35 -08:00
Darren Stahl
d7692b02bd Typo in previous PR processConfig, not c.ProcessConfig 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2015-11-16 11:56:01 -08:00
Alexander Morozov
a3065fa48f Merge pull request #17891 from splunk/splunk-logger-support-for-tag-env-labels 
Allow configurable metadata for Splunk log driver
 2015-11-16 10:11:27 -08:00
moxiegirl
4b706195d2 Merge pull request #17515 from azurezk/fixdoc 
fix doc of volume name conflict
 2015-11-16 09:15:50 -08:00
Sebastiaan van Stijn
e88ffba2ec Merge pull request #18016 from moxiegirl/carry-17453 
docs: modifying volumes guide to remove ambiguity. Signed-off-by: And…
 2015-11-16 17:35:04 +01:00
Sebastiaan van Stijn
7c5cdda74e Merge pull request #17604 from RyanDeng/fix_cpuPercent_extremelyHigh 
fix the bug: cpu percent will extremely high
 2015-11-16 17:26:29 +01:00
Andre Granovsky
be2152116c docs: modifying volumes guide to remove ambiguity. Signed-off-by: Andre Granovsky <robotciti@live.com> 
Adjusted as per comment.
Rebase and squash by moxigirl

Signed-off-by: Andre Granovsky <robotciti@live.com>
 2015-11-16 08:24:26 -08:00
Luca Orlandi
fe123edb08 Update ubuntulinux.md 
Remove '*' for purge

Signed-off-by: Luca Orlandi <luca.orlandi@gmail.com>
 2015-11-16 13:29:36 +01:00
Tibor Vass
92487d7fb4 Merge pull request #17985 from Microsoft/jjh/firstboot 
Windows: [TP4] Fix regression on second or later container starts
 2015-11-16 10:03:46 +01:00
Kunal Kushwaha
aa7fd884e6 Supported added for reterving Plugin list for Network and Volume. 
Also, plugin information in docker info output.

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
 2015-11-16 15:28:09 +09:00
John Howard
b2771b4456 Windows: Disable links 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-11-15 21:32:31 -08:00
Vincent Demeester
3b1acde99b Merge pull request #17995 from albers/completion--volume-driver 
bash completion for `docker {run,create} --volume-driver`
 2015-11-16 04:40:20 +01:00
Tianon Gravi
927e1e98b7 Remove "-linkmode external" 
We're having to override it in so many places that it no longer seems worthwhile to bother.  On top of that, the reason we did it in the first place was for being able to compile devicemapper statically, which still works after this change (either due to other changes in the way we build, or improvements in Go itself).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-11-15 14:47:48 -08:00
Harald Albers
d411c47139 bash completion for docker {run,create} --volume-driver 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-11-15 09:53:22 -08:00
John Howard
7e5e29e415 Windows [TP4] Fix push to not kill daemon 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-11-15 08:43:23 -08:00
Zhang Kun
82ba25bea9 fix doc 
Signed-off-by: Zhang Kun <zkazure@gmail.com>

fix doc

Signed-off-by: Zhang Kun <zkazure@gmail.com>
 2015-11-15 23:32:40 +08:00
Govinda Fichtner
b74fd0628a Add initial support for Docker on ARM 
Signed-off-by: Govinda Fichtner <govinda.fichtner@googlemail.com>
 2015-11-15 13:15:31 +01:00
Tibor Vass
59fe485f0d Merge pull request #17945 from tonistiigi/fix-windows-pull 
Fix docker pull on windows
 2015-11-15 12:32:25 +01:00
Antonio Murdaca
7929888214 Remove deprecated cli flags 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2015-11-15 10:40:01 +01:00
Kenjiro Nakayama
d9ef4f2986 Fix invalid proxy setting example 
Signed-off-by: Kenjiro Nakayama <nakayamakenjiro@gmail.com>
 2015-11-15 17:11:27 +09:00
Sebastiaan van Stijn
cf824d9749 Merge pull request #17479 from coolljt0725/show_warning 
Show warning when user specify dm.basesize for already initialized devicemapper driver
 2015-11-15 08:51:33 +01:00
Tibor Vass
586152523d Merge pull request #17987 from jfrazelle/correct-ltdl 
Correct ltdl and fix experimental macro for rpms
 2015-11-15 03:46:23 +01:00
daehyeok mun
086c0b4a66 Extract rotate file writer from json log driver 
Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
 2015-11-14 16:15:44 -07:00
Luca-Bogdan Grigorescu
d1e72baa15 Fix small typos in documentation files 
Signed-off-by: Luca-Bogdan Grigorescu <bogdan@gmail.com>
 2015-11-15 00:53:27 +02:00
Jessica Frazelle
38724c80ab
fix experimental boolean macro 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-11-14 14:47:13 -08:00
Vincent Demeester
49779b674a Add pkg/parsers/architecture and pkg/platform 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-11-14 23:03:02 +01:00
Olle Jonsson
4e8fcd4002 /info: Add keys Architecture, OSType 
- introduces Swarm-relevant keys, see #13634
  - docs updated

Signed-off-by: Olle Jonsson <olle.jonsson@gmail.com>
 2015-11-14 22:21:45 +01:00
Vincent Demeester
31a6e01f47 Merge pull request #17009 from azurezk/user-checkers 
add c.Assert in docker_cli_ps_test.go
 2015-11-14 20:22:15 +01:00
John Howard
8da449055f Windows: Fix regresion on first boot 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-11-14 11:06:19 -08:00
Alexander Morozov
fb77b822ad Merge pull request #17758 from rhatdan/dynbinary 
Since default is dynbinary we should test with dynbinary
 2015-11-14 10:54:03 -08:00
Jessica Frazelle
41619f4a90
correct ltdl for centos 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-11-14 08:50:58 -08:00
Antonio Murdaca
ad8a66573c Merge pull request #17851 from Microsoft/10662-ArgumentEscaping 
Prevent double escaping of Dockerfile commands on Windows
 2015-11-14 17:25:53 +01:00
Arnaud Porterie
7a6f2cdeeb Merge pull request #17937 from diogomonica/notary-pkcs11-client-integration 
New version of notary with pkcs11 client integration
 2015-11-14 12:03:29 +01:00
Dan Walsh
0d47b74a7f Since default is dynbinary we should test with dynbinary 
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
 2015-11-14 06:01:55 -05:00
Anil Belur
4699ef8f87 Adding test for the fix #17168. 
The test case creates a mount point, starts the daemon with the
graph dir pointing to the mount and initates a pull request. We should
be able to check for the error message when the mount point gets filled
during pull.

Signed-off-by: Anil Belur <askb23@gmail.com>
 2015-11-14 16:24:45 +05:30
Anil Belur
31cdc63419 Fix for #17168 misleading pull error 
This fix avoids overwritting the previous error messages, ensures the client gets the correct error messages and not just the most recent message during the pull request.
For this `var lastErr` replaced with a slice which acts as a temp place holder for the list of returned error messages for every attempt.
The slice is later joined and returned to the caller function after searching for the image with diffirent versions(v2,v1,v0).

Updated the code with check for no space left on device error occurance and prevent the
daemon on falling back to v1,v0.

Incorporated the comments from @calavera, @RichardScothern, @cpuguy83

Signed-off-by: Anil Belur <askb23@gmail.com>
 2015-11-14 16:24:45 +05:30
Antonio Murdaca
1448cd3ec2 Merge pull request #17971 from narqo/simplify-addr-formating 
Simplify final address formatting in parser.ParseTCPAddr
 2015-11-14 08:38:09 +01:00