toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,755 Commits 3 Branches 295 Tags
70bd19afc19b31b61e79154ef698741c92da8a32
Commit Graph
16755 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Antonio Murdaca d1facd32fc Expose whole Response struct in sockRequestRaw 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: bb1c576eb3024f7fb4242d76dc835b7c4dd85c5b
Component: engine
 2015-04-27 18:49:00 +02:00
John Howard ca495f5d0d Windows: Refactor volumes 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ba1725a94ee75603d3a21e0580be3954fc689137
Component: engine
 2015-04-27 09:27:15 -07:00
Brian Goff b3b10cf345 Merge pull request #12807 from jmzwcn/patch-2 
Remove dead code from daemon/daemon.go
Upstream-commit: 6856c69c41880946125357ae11be00ac07de08b8
Component: engine
 2015-04-27 12:10:30 -04:00
Alexander Morozov 563a5f77d4 Merge pull request #12809 from runcom/remove-cfatal-goroutine-attachws 
Remove c.Fatal from goroutine in TestGetContainersAttachWebsocket
Upstream-commit: 5305e675b554a7451433bbd64bca4d6f3070a45b
Component: engine
 2015-04-27 08:59:47 -07:00
Jessie Frazelle 3458282944 Merge pull request #12714 from noxiouz/fix_race_stats_collector 
statsCollector: fix data race in run()
Upstream-commit: 9f684c85926fd5280e0bc604507d5b5f80353d48
Component: engine
 2015-04-27 10:57:56 -05:00
Alexander Morozov 4342c93053 Merge pull request #12799 from aidanhs/aphs-fix-net-container-deadlock 
Prevent deadlock on --net=container:<self>
Upstream-commit: 02d73d910fa56e89a2d999b95b0fa0738332fed7
Component: engine
 2015-04-27 08:46:22 -07:00
John Howard 513af8ec95 Windows: Info no containerized check 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ab97303caed2a7be474e2c4ff7a55af9d6c8c3cc
Component: engine
 2015-04-27 08:38:01 -07:00
Phil Estes 32c7f6f272 Merge pull request #12803 from ZJU-SEL/remove_useless_export_httpcall 
remove useless http call from export
Upstream-commit: 8ec22ae87dac85f8f06f560842a0d001977a8cda
Component: engine
 2015-04-27 11:33:13 -04:00
Zhang Wei 25e6857dc9 improve docker man page 
fix issue #12708:
"docker man page is misleading about format of commands"

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 29f379ea6e2a68d8ac4bf41d3559a52066a275a0
Component: engine
 2015-04-27 23:27:35 +08:00
Brian Goff 5e258c2907 Merge pull request #12783 from duglin/Issue12763-LinkedEnvs 
A fix for = in env values in linked containers
Upstream-commit: 8dc07af52f1822a1d337f005c6c4292611d3313d
Component: engine
 2015-04-27 10:50:14 -04:00
Doug Davis 55c6259a4a Merge pull request #12616 from cpuguy83/remove_uneeded_sleeps 
remove some uneeded sleeps in tests
Upstream-commit: 325c0404c84db11630cfcc24ac93cb82763de511
Component: engine
 2015-04-27 10:42:40 -04:00
Brian Goff bb3c396980 remove some uneeded sleeps in tests 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 9e0ffae864d6679084e84e2e27cbb9d350f6dbae
Component: engine
 2015-04-27 10:14:29 -04:00
Aidan Hobson Sayers 270e43ec62 Prevent deadlock on attempt to use own net 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: f30d1c1835618eadea5d0a68d1301dffd9f09b22
Component: engine
 2015-04-27 14:57:37 +01:00
Antonio Murdaca e570165119 Remove c.Fatal from goroutine in TestGetContainersAttachWebsocket 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: c7b2632dc8550c8aa80ebd8b229809ac37fa53e1
Component: engine
 2015-04-27 13:56:55 +02:00
jmzwcn ad85faa2ca Remove dead code from daemon/daemon.go 
fix #12492
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>
Upstream-commit: accbbfeae4c2f3ceb68060e08e46e382cdefc975
Component: engine
 2015-04-27 15:50:47 +08:00
He Simei 5d5dd54df9 remove useless http call from export 
Signed-off-by: He Simei <hesimei@zju.edu.cn>
Upstream-commit: 6d9439c627e36349679249d991400da45eb75587
Component: engine
 2015-04-27 12:41:03 +08:00
Jinsoo Park f524e9a7da add library files for socat in mkimage-unittest.sh 
in https://docs.docker.com/articles/ambassador_pattern_linking/
svendowideit/ambassador images is from docker-ut built using this script
and uses socat but socat complains as follows
socat: error while loading shared libraries: libreadline.so.5: cannot open shared object file: No such file or directory
socat: error while loading shared libraries: libssl.so.1.0.0: cannot open shared object file: No such file or directory
socat: error while loading shared libraries: libcrypto.so.1.0.0: cannot open shared object file: No such file or directory
socat: error while loading shared libraries: libtinfo.so.5: cannot open shared object file: No such file or directory
/usr/lib/x86_64-linux-gnu/lib{crypto,ssl}.so* lib are symlinks so removing -P option from cp
adding libreadline.so and libtinfo.so

Signed-off-by: Jinsoo Park <cellpjs@gmail.com>

update libssl.so path

Signed-off-by: Jinsoo Park <cellpjs@gmail.com>

Remove mkimage-unittest.sh

Signed-off-by: Jinsoo Park <cellpjs@gmail.com>
Upstream-commit: f930c86cb1ea94525ecc8a0331277afad99d4c1a
Component: engine
 2015-04-26 23:35:19 -04:00
Daniel Nephin b5c5cd32f2 Add missing API docs about filtering by label. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
Upstream-commit: cfd0f53b03d26c370e37abf651d7f481ee8c6912
Component: engine
 2015-04-26 15:36:01 -04:00
moxiegirl 145f0ac265 Merge pull request #12787 from epc/copyedits 
Copy edits for typos
Upstream-commit: 6cba3109c2a9c0c20d2541605a9aa7873225a224
Component: engine
 2015-04-26 10:40:18 -07:00
Mary Anthony 520d5524c2 Adding James and theJeztah to the list 
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: ba79f0ca1f389e3c87c19b2c326b3b6afbebc8ef
Component: engine
 2015-04-26 10:32:43 -07:00
Antonio Murdaca e5f7f8da6f Replace json.Unmarshal with json.Decoder().Decode() 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 26543e03095eaa45d9afc12c029f07539323fee5
Component: engine
 2015-04-26 15:02:01 +02:00
David Calavera d5259f3ff9 Merge pull request #12734 from sergey-alekseev/sergey-alekseev-patch-1 
Fix documentation typo in articles/basics.md
Upstream-commit: 92f4bd59ce941233b295ec2b2e5faa974105ad40
Component: engine
 2015-04-25 20:33:55 -07:00
Alexander Morozov 13d6b715bf Merge pull request #12728 from HuKeping/addtest 
Add test for REST API container rename
Upstream-commit: fefb8367663e5f97f8c85418691b10c6e9356134
Component: engine
 2015-04-25 17:01:10 -07:00
Nathan LeClaire 04f8bd2003 Migrate integration test to new method 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Upstream-commit: 9dbe12b792a46538c01862930c85ace18dbe14f3
Component: engine
 2015-04-25 17:12:01 -04:00
Marianna b3b4c052f9 Make the docs for --cgroup-parent better 
Signed-off-by: Marianna <mtesselh@gmail.com>
Upstream-commit: a8dfafc98642455ed83f9422f3174fa828dde4df
Component: engine
 2015-04-25 16:35:28 -04:00
Nathan LeClaire 0a0035ed72 Add dep to test 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Upstream-commit: 65aba0c9d6a72fc89f87c328e9ca21e20bf3cf7a
Component: engine
 2015-04-25 15:25:52 -04:00
Nathan LeClaire 2f02e8950c Fix gofmt 
Mischevious comma is mischevious

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Upstream-commit: f039c699a40397b71f05838e9a9c67100ae474c6
Component: engine
 2015-04-25 15:25:52 -04:00
Marianna 43c42369ac Add test for cgroup parent flag for build 
Signed-off-by: Marianna <mtesselh@gmail.com>
Upstream-commit: f40dd69c97a5a3797f07d52fe5f76e296ef629dc
Component: engine
 2015-04-25 15:25:52 -04:00
Julien Barbier 9f2b2b3d39 Adding doc 
Signed-off-by: Julien Barbier <write0@gmail.com>
Upstream-commit: 81897adcee8813efdff8374a1f46125b7e094847
Component: engine
 2015-04-25 15:25:51 -04:00
Julien Barbier 7a068916d5 Happy birthday Docker! cgroup-parent option for docker build. Thanks to Michael, Nathan and Jessie for their support! #42 
Signed-off-by: Julien Barbier <write0@gmail.com>
Upstream-commit: bb411939989dabb56eb604b9a873d1dfbf0646ef
Component: engine
 2015-04-25 15:25:51 -04:00
Ed Costello d7a0961327 Copy edits for typos 
Signed-off-by: Ed Costello <epc@epcostello.com>
Upstream-commit: fa9299f4c03cf097887db26dadcc63c711c925f1
Component: engine
 2015-04-25 15:01:05 -04:00
Alexander Morozov 20ce7aff2a Merge pull request #12784 from duglin/RaceCommit 
Fix race condition in API commit test
Upstream-commit: b5ccfca565fae04dc2f95160e0c99925b79c4e13
Component: engine
 2015-04-25 10:03:03 -07:00
Doug Davis 478eada080 Fix race condition in API commit test 
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: cd4f507b42e800d148b211ca2c780d01192a9041
Component: engine
 2015-04-25 05:46:47 -07:00
Doug Davis 1e118310a9 A fix for = in env values in linked containers 
Closes: #12763

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: bc149be69c5ad22f82269427dd4b4aed9df4fa40
Component: engine
 2015-04-25 04:42:43 -07:00
Hu Keping e384b42fa8 Add test for REST API container rename 
Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 8f752ffeafd2f8c08035a5e39220fe17c9309fd7
Component: engine
 2015-04-25 17:19:57 +08:00
Sergey Alekseev 940ced577b Fix documentation typo in articles/basics.md 
Signed-off-by: Sergey Alekseev <sergey.alekseev.minsk@gmail.com>
Upstream-commit: 2188c8d2f41f4905411a40c30f4c703d7f4e0fcf
Component: engine
 2015-04-25 11:32:17 +03:00
Alexander Morozov de733ff8fe Merge pull request #12744 from vdemeester/11603-pkg-archive-test-coverage-2 
Add coverage on pkg/archive (related to #11603)
Upstream-commit: 272e612b657d787eb4d6844a032c9fda006de677
Component: engine
 2015-04-24 22:12:01 -07:00
Phil Estes 8d345fadf2 Merge pull request #12765 from LK4D4/registry_suite 
Implement DockerRegistrySuite in integration-cli
Upstream-commit: 6e9a6f53963137e21ba790ab79501a7cd8ed5b96
Component: engine
 2015-04-24 23:05:29 -04:00
He Simei fcf89e495c Fix error prompt for pull & import handler postImagesCreate. 
Signed-off-by: He Simei <hesimei@zju.edu.cn>
Upstream-commit: daad696e091c931c8f0bf210c65d90db27b0af74
Component: engine
 2015-04-25 09:10:32 +08:00
Jessie Frazelle 76fb01ab2b Merge pull request #12699 from vbatts/vbatts-init_mnt_ns 
contrib/init: unshare mount namespace for inits
Upstream-commit: c3ef6df9c354f2df9eea2f4fce53b27637453367
Component: engine
 2015-04-24 17:52:11 -07:00
Jessie Frazelle 481fc69198 Merge pull request #12775 from Microsoft/12774-fixtypo 
Fixed typo 'configuring'
Upstream-commit: 9ad7145dae4f843e755ba7d7b72741bb0aefc93e
Component: engine
 2015-04-24 17:21:40 -07:00
John Howard aac3868541 Fixed typo 'configuring' 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ae9905ef9c5e8fe793e6a6269bb720618f4fcaed
Component: engine
 2015-04-24 16:52:32 -07:00
Ankush Agarwal 0909a59dd0 Eliminate json.Marshal from graph/export.go and volumes/volume.go 
Fixes #12531
Fixes #12530

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 29a3bbf2b375111b9494df1ce5ee457508f7acad
Component: engine
 2015-04-24 15:40:21 -07:00
Alexander Morozov 0fce158f4b Merge pull request #12764 from LK4D4/not_protect_dangling 
Not protect dangling images for integration-cli
Upstream-commit: 602fd4e14b21972c1a98e8e889f264ca4c65d20f
Component: engine
 2015-04-24 14:19:55 -07:00
Alexander Morozov a2a6303a84 Implement DockerRegistrySuite in integration-cli 
To avoid manually creating and destroying registrys in tests.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: f696b1071a296bee1f4ac7cafa807ce337fb9f2c
Component: engine
 2015-04-24 14:17:00 -07:00
Brian Goff 2846dea0ee Merge pull request #12762 from ibuildthecloud/export-restart-parse 
Expose ParseRestartPolicy
Upstream-commit: aa064621ddb8b24b217eea5dd2ea625531f78f42
Component: engine
 2015-04-24 16:30:18 -04:00
Alexander Morozov 54dc746ae6 Not protect dangling images for integration-cli 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 9bea123bddb9d2ce8b2aa517c2a2a4b269ed39bc
Component: engine
 2015-04-24 13:16:51 -07:00
Brian Goff 9fc945a9c1 Merge pull request #12755 from LK4D4/use_f_for_remove 
Use -f for rm instead of kill before
Upstream-commit: b76bbae4138e7b66022092631d6afb7cfc88a486
Component: engine
 2015-04-24 15:34:38 -04:00
Darren Shepherd 6cf508507e Expose ParseRestartPolicy 
ParseRestartPolicy is useful function for third party go programs to use
so that they can parse the restart policy in the same way that Docker
does

Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: 366ee6bdfa9d2c87d006a162fc951ecc0f68051a
Component: engine
 2015-04-24 12:23:54 -07:00
Alexander Morozov 785df704ce Use -f for rm instead of kill before 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 887ad57cfa46df542001a1bb4e3ab052ce5f5ed9
Component: engine
 2015-04-24 11:55:54 -07:00