clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-28 17:10:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,206 Commits 9 Branches 112 Tags
407a626be62996cd6385ea4d80e669ab83f5f04d
Commit Graph
16206 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vivek Goyal 407a626be6 docker-inspect: Extend docker inspect to export image/container metadata related to graph driver 
Export image/container metadata stored in graph driver. Right now 3 fields
DeviceId, DeviceSize and DeviceName are being exported from devicemapper.
Other graph drivers can export fields as they see fit.

This data can be used to mount the thin device outside of docker and tools
can look into image/container and do some kind of inspection.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
 2015-06-15 14:05:10 -04:00
Alexander Morozov 1157fcc4a4 Merge pull request #13926 from Microsoft/10662-createfixup 
Windows: Fixup compile in daemon_windows.go
 2015-06-15 10:17:24 -07:00
Sebastiaan van Stijn 637023a5f8 Merge pull request #13502 from coolljt0725/conflict_port_and_netmode 
Add --net=container with --publish --expose --publish-all error out
 2015-06-15 16:25:59 +02:00
moxiegirl ee40f29712 Merge pull request #13927 from moxiegirl/carry-13250 
Carry of PR #13520
 2015-06-13 10:29:56 -07:00
Tibor Vass f27c9bc6e7 Merge pull request #13895 from calavera/fix_get_env_split 
Correct getEnv split.
 2015-06-13 12:43:45 -04:00
Mary Anthony cd44018856 Carry of PR #13520 
Removinig files

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-13 09:27:30 -07:00
Arnaud Porterie cd36b15ccb Merge pull request #13860 from jlhawn/cli_call_headers 
api/client: have cli.call() return headers
 2015-06-13 09:14:40 -07:00
John Howard c7975f12d6 Windows: Fixup compile in daemon_windows.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-06-13 09:10:54 -07:00
Arnaud Porterie 261af00282 Merge pull request #13682 from mavenugo/ln_vin 
Vendoring in libnetwork to 3be488927db8d719568917203deddd630a194564
 2015-06-13 09:00:33 -07:00
Doug Davis f1ea3e5c74 Merge pull request #13504 from coolljt0725/refactor_verifyhostconfig 
Refactor verifyHostConfig: change to verifyConfigs and add verify config
 2015-06-12 19:59:45 -07:00
Lei Jitang b37832e353 Add verify config to verifyContainerSettings 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-06-13 09:31:19 +08:00
Arnaud Porterie 422fa7f0a6 Merge pull request #13749 from Microsoft/adduseragent 
Add GOOS in User-Agent
 2015-06-12 17:19:51 -07:00
Michael Crosby 39bf57e085 Merge pull request #13344 from hqhq/hq_fix_arm64_test 
Fix unit-test build error on ARM64
 2015-06-12 17:11:18 -07:00
Arnaud Porterie 6a7a7570bb Merge pull request #12833 from burke/faster-changes 
Optimize archive.ChangesDirs on Linux
 2015-06-12 17:05:34 -07:00
Madhu Venugopal 083300168f Vendoring in libnetwork to 3be488927db8d719568917203deddd630a194564 
This PR brings the vendored libnetwork code to
3be488927db8d719568917203deddd630a194564, which pulls in quite a few
fixes to support kvstore, windows daemon compilation fixes,
multi-network support for Bridge driver, etc...

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-06-12 16:10:40 -07:00
Jessie Frazelle cd71c5ed43 Merge pull request #13836 from amylindburg/master 
Update plugins.md
 2015-06-12 15:40:20 -07:00
Amy Lindburg 0a529b6e7a Update plugins.md 
Fixed broken link.

Signed-off-by: Amy Lindburg <amy.lindburg@docker.com>

Update plugins.md

Some other broken links!

Signed-off-by: Amy Lindburg <amy.lindburg@docker.com>

Update plugin_api.md

FIxing broken links.

Signed-off-by: Amy Lindburg <amy.lindburg@docker.com>

Update plugins_volume.md

Fixing more links.

Signed-off-by: Amy Lindburg <amy.lindburg@docker.com>
 2015-06-12 15:38:15 -07:00
David Calavera 421b9b6859 Merge pull request #13916 from Microsoft/10662-compileserver 
Windows: Patch up compile after adjustCpuShares
 2015-06-12 13:48:22 -07:00
John Howard d2c5fcc8d5 Windows: Patch up compile after adjustCpuShares 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-06-12 13:00:59 -07:00
Antonio Murdaca 5bddafe169 Merge pull request #13912 from icecrime/13902_improve_test 
Replace "sleep" by "top" in test implementation
 2015-06-12 20:24:31 +02:00
David Calavera e7533d7f81 Merge pull request #13494 from Microsoft/10662-vfsdriveroption 
Windows: Allow VFS
 2015-06-12 11:12:32 -07:00
Antonio Murdaca 27e2837c6c Merge pull request #13911 from cpuguy83/13910_fix_stats_nostream_resp 
Fixes content-type/length for stats stream=false
 2015-06-12 19:53:18 +02:00
Arnaud Porterie e5b7f61f09 Replace "sleep" by "top" in test implementation 
Eliminate any chance of race condition by replacing a call to sleep by a
call to top, and rely on test cleanup logic to have it exit cleanly.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-06-12 10:45:42 -07:00
Arnaud Porterie 2351557607 Merge pull request #13902 from ibuildthecloud/api-fixes 
Set omitempty for IP and PublicPort to conform w/ API 1.18
 2015-06-12 10:42:07 -07:00
Brian Goff 855a056af7 Fixes content-type/length for stats stream=false 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-06-12 13:06:06 -04:00
Darren Shepherd 09de92b891 Set omitempty for IP and PublicPort to conform w/ API 1.18 
Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-06-12 09:49:53 -07:00
John Howard e89f837bc6 Windows: Allow VFS 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-06-12 09:21:17 -07:00
Arnaud Porterie 5a02d0727b Merge pull request #13899 from mavenugo/hp 
Vendoring in libnetwork to fix #13873.
 2015-06-12 07:27:07 -07:00
Brian Goff c98eafe564 Merge pull request #13906 from chenchun/closed_chan 
Fix send on closed channel bug
 2015-06-12 09:37:53 -04:00
Brian Goff e70d680d72 Merge pull request #13903 from dqminh/fix-cli-exec-output 
TestExecStopNotHanging: log output as string
 2015-06-12 09:23:45 -04:00
Madhu Venugopal f3d1826350 Vendoring in libnetwork to fix #13873. 
Libnetwork sha# e578e95aa101441481411ff1d620f343895f24fe

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-06-12 04:58:37 -07:00
Chun Chen a408790de8 Fix send on closed channel bug 
Signed-off-by: Chun Chen <chenchun.feed@gmail.com>
 2015-06-12 15:42:34 +08:00
Daniel, Dao Quang Minh d898372568 TestExecStopNotHanging: log output as string 
When cmd failed, log its ouput as string instead of byte array to prevent test
log like: [49 53 ....] exit status 1

Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
 2015-06-11 22:53:55 -04:00
Arnaud Porterie 00b8fec75f Merge pull request #13773 from dmcgowan/refactor-1-image-graph-separation 
refactor: separate graph from image
 2015-06-11 17:44:37 -07:00
David Calavera 85f895ce68 Correct getEnv split. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-06-11 14:40:46 -07:00
Arnaud Porterie 71ead0ef5c Merge pull request #13722 from samuelkarp/CpuShareRemoteAPI 
Adjust disallowed CpuShares in /containers/create
 2015-06-11 14:20:50 -07:00
Jessie Frazelle 0de7065897 Merge pull request #13801 from bexelbie/bex_manpage_indention 
Updates man page generation to use go-md2man v1.0.2
 2015-06-11 14:12:17 -07:00
Jessie Frazelle 98391f0a39 Merge pull request #13890 from moxiegirl/vieux-fix 
Updating with fix for first line and the vieux/amy comment on website
 2015-06-11 13:22:03 -07:00
Mary Anthony 566466e714 Updating with fix for first line and the vieux/amy comment on website 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-11 12:48:01 -07:00
Jessie Frazelle cada9b54b5 Merge pull request #13865 from Mic92/zfs-selinux 
zfs: correctly apply selinux context
 2015-06-11 12:42:06 -07:00
Jessie Frazelle e3821feb13 Merge pull request #13783 from tianon/vendor-pruning 
Add intelligent vendor pruning (via "go list")
 2015-06-11 10:32:53 -07:00
Tianon Gravi b0d748325f Update "vendor/" 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-06-11 09:59:12 -07:00
Tianon Gravi 9e4ee3dea5 Add intelligent vendor pruning (via "go list") 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-06-11 09:59:12 -07:00
Tianon Gravi f61d595b55 Adjust "Dockerfile" to build tools we need in isolated mktemp GOPATHs 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-06-11 09:59:12 -07:00
Doug Davis b27f960504 Merge pull request #13879 from eolamey/13878-nil-ip-opt-as-empty-string 
Display empty string instead of <nil> when IP opt is nil.
 2015-06-11 09:30:52 -07:00
moxiegirl 9001c4bc48 Merge pull request #13839 from eolamey/13838-fix-docs-url 
Fix docs URL not using https.
 2015-06-11 08:59:35 -07:00
Brian Goff 4fc6449944 Merge pull request #13861 from mrjana/cnm_integ 
Vendoring libnetwork to fix stale arp cache issue
 2015-06-11 09:12:34 -04:00
Eric-Olivier Lamey 9ad89281ae Display empty string instead of <nil> when IP opt is nil. 
Fixes #13878.

Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>
 2015-06-11 11:14:28 +00:00
Vincent Batts ef171afdbb Merge pull request #13590 from mountkin/fix-archive-tests 
Add the parent directory to changes set if new files are generated
 2015-06-11 05:12:45 -04:00
Jörg Thalheim 19c31a703f zfs: correctly apply selinux context 
fixes #13858

Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
 2015-06-11 11:11:37 +02:00