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

19976 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alexander Morozov
346d195f6a Merge pull request #17334 from sdurrheimer/zsh-completion-log-options 
Add zsh completion for log options
 2015-11-17 15:53:31 -08:00
Michael Crosby
53556183c7 Merge pull request #17434 from little-arhat/fix/newlines-in-json-status 
Add newlines to FormatProgress for JSON as well
 2015-11-17 15:52:31 -08:00
Michael Crosby
104dab87ea Merge pull request #17478 from vdemeester/pr-13921 
Carry#13921 : Expand /info: Expose OSType (GOOS), Architecture (GOARCH)
 2015-11-17 15:44:57 -08:00
Alexander Morozov
adce1981f4 Merge pull request #17593 from daehyeok/refactoring_json_log 
Refactoring json log driver
 2015-11-17 15:38:52 -08:00
Michael Crosby
ca0b41e337 Merge pull request #18000 from daehyeok/fix_dry_run_test 
Modified cpuset test for unicore test environment
 2015-11-17 15:15:09 -08:00
Michael Crosby
7147ac6ce7 Merge pull request #18023 from LK4D4/goodbye_dind 
Remove cgroup mounting in dind
 2015-11-17 15:12:08 -08:00
Daehyeok Mun
a9afebae62 Modified cpuset test for unicore test environment 
Modified TestInspectApiCpusetInConfigPre120 and
TestContainerApiCreateWithCpuSharesCpuset for working on unicore cpu
environment.

Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
 2015-11-17 13:28:09 -07:00
Jess Frazelle
aeccd45e5b Merge pull request #17419 from nathwill/cent-install-docs 
fix yum install docs
 2015-11-17 20:57:15 +01:00
Alexander Morozov
d3744fbeb1 Merge pull request #18002 from Microsoft/10662-registerlinks 
Windows: Disable links
 2015-11-17 11:48:53 -08:00
Michael Crosby
e58b0bba7f Merge pull request #18024 from LK4D4/simple_byparent 
graph/graph.go: simplify appending to slice in map in byParent
 2015-11-17 11:45:24 -08:00
Michael Crosby
1ecb9a40db Merge pull request #17974 from anusha-ragunathan/fsMagic 
Fix devmapper backend in docker info
 2015-11-17 11:44:48 -08:00
Alexander Morozov
9187656305 Merge pull request #16639 from mrunalp/skip_dev_setup 
Skip /dev setup in container when it is bind mounted in
 2015-11-17 11:36:00 -08:00
Michael Crosby
19debeb255 Merge pull request #18027 from tpounds/fix-err-message-typo 
Fix error typo when --expose and --net are specified
 2015-11-17 11:34:40 -08:00
Michael Crosby
d0696ab7f6 Merge pull request #18028 from LK4D4/carry_17174 
Use /usr/lib/os-release if /etc/os-release is missing.
 2015-11-17 11:26:24 -08:00
Michael Crosby
68336bc832 Merge pull request #18043 from tianon/freebsd-package-name 
Fix "./docker" package name on freebsd
 2015-11-17 11:17:26 -08:00
Alexander Morozov
4dda67b801 Merge pull request #16452 from rhatdan/btrfs-selinux 
Relabel BTRFS Content on container Creation
 2015-11-17 11:03:40 -08:00
Antonio Murdaca
8fff64fe4f Merge pull request #18044 from tianon/a.out 
Prevent the creation of "a.out" at the repo root
 2015-11-17 20:00:07 +01:00
Alexander Morozov
f18d5da6a7 Merge pull request #17300 from kunalkushwaha/plugin-info 
Patch for Plugin drivers in docker info
 2015-11-17 10:46:29 -08:00
Alexander Morozov
e55274e3fe Merge pull request #18014 from calavera/make_normalize_local_name_local 
Make NormalizeLocalName to not reach the network to normalize names.
 2015-11-17 10:23:41 -08:00
Tianon Gravi
7f608c391d Prevent the creation of "a.out" at the repo root 
Our clever "gcc" invocations were creating a spurious "a.out" file at the root of the repo (which just happened to be in ".gitignore" so we didn't notice it sooner).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-11-17 09:44:36 -08:00
Tianon Gravi
e54c4517a7 Fix "./docker" package name on freebsd 
This fixes "can't load package: package ./docker: found packages client.go (main) and daemon_freebsd.go (docker)"

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-11-17 09:38:19 -08:00
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
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
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