toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,121 Commits 3 Branches 295 Tags
ac15f3e4a011a3ee8006a348606978a272e653fe
Commit Graph
15121 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Goff ac15f3e4a0 Merge pull request #12818 from Microsoft/10662-nocontainercheckonwindows 
Windows: Info no containerized check
Upstream-commit: 97b35bab8172408550397bef94cd618c7e9a120e
Component: engine
 2015-04-27 12:56:28 -04: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
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
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
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
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
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
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
Brian Goff f6e14ef42d Merge pull request #12754 from LK4D4/carry_12707 
fix runtime issue for TestEventsFilterContainer
Upstream-commit: 03719be8302d904893b97c03a3bf94f50a376876
Component: engine
 2015-04-24 14:36:58 -04:00
Doug Davis 309992418e Merge pull request #12753 from LK4D4/remove_all_images 
Implement teardown removeAllImages
Upstream-commit: 700056cd4c43157429190155ff10e5ed3d169296
Component: engine
 2015-04-24 14:16:04 -04:00
Anton Tiurin ffb16a8d52 statsCollector: fix data race in run() 
statsCollector.publishers must be protected to prevent
modifications during the iteration in run().
Being locked for a long time is bad, so pairs of containers &
publishers (pointers) are copied to release the lock fast.

Signed-off-by: Anton Tiurin <noxiouz@yandex.ru>
Upstream-commit: 11a5f1af01842acf9a25ccebb59f36472ae51170
Component: engine
 2015-04-24 21:07:48 +03:00
Daniel Antlinger 3acd724e10 fix runtime issue for TestEventsFilterContainer 
Signed-off-by: Daniel Antlinger <d.antlinger@gmx.at>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 07795c3f5db3aa8ff592b0606ab76d32db4c6d25
Component: engine
 2015-04-24 10:48:40 -07:00
Alexander Morozov c48fdf0abd Implement teardown removeAllImages 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: a9688cdca5577d6db65d76f38bcbe4c1e6f5994f
Component: engine
 2015-04-24 10:37:21 -07:00
Alexander Morozov cc66f7a04e Merge pull request #12502 from calavera/shallow_git_history 
Shallow clone using git to build images.
Upstream-commit: 790c63a5ef34d54ae8ba79886b6c8daae547bf25
Component: engine
 2015-04-24 10:16:01 -07:00
David Calavera dfd9ef2b64 Remove duplicated git clone logic. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 1cfb307d70558110e8e88a7391ae0e6cf6ebf174
Component: engine
 2015-04-24 09:39:45 -07:00
David Calavera ecfd095619 Document the extra depth argument in git contexts. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 8bd5a95e1e39541dfc5dc635c5c8e7604fe10028
Component: engine
 2015-04-24 09:39:39 -07:00
David Calavera 44cdfe63b1 Test that we set the right arguments for git cloning depending on the transport. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3117bf3ef562bc43ef007d8afe3815c58aac6e85
Component: engine
 2015-04-24 09:39:38 -07:00
David Calavera d5b0b24bb8 Do not try to shallow git history when the protocol doesn't allow it. 
This only happens with the old git http dumb protocol, but that's what we use in our integration tests.
We check the Content-Type header advertised in http requests to make sure the http transport is the git smart transport:

See this commit as a reference:
https://github.com/git/git/commit/4656bf47fca857df51b5d6f4b7b052192b3b2317

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9fb7204a41804131c2492f9d50d7451e123a05e5
Component: engine
 2015-04-24 09:39:38 -07:00
David Calavera 3c2cab11aa Shallow clone using git to build images. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 36fbf4b86469ca6fe3677d47c9a1976bcdd111e4
Component: engine
 2015-04-24 09:39:38 -07:00
Phil Estes 4b91c36f40 Merge pull request #12678 from vdemeester/fix-advanced-contributing-doc 
Documentation: fix the design proposal link in advanced contribution page
Upstream-commit: 310fc37fe76421109109c11c1181b97ce93b6c80
Component: engine
 2015-04-24 11:12:36 -04:00
Vincent Demeester 3e9177d587 Add coverage on pkg/archive 
Add tests on:
- changes.go
- archive.go
- wrap.go

Should fix #11603 as the coverage is now 81.2% on the ``pkg/archive``
package. There is still room for improvement though :).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: c21d408ad24cf8e2b5bd761d562fae7e3ae1bc54
Component: engine
 2015-04-24 17:03:33 +02:00
Fred Lifton 04fcadddd6 Merge pull request #12729 from SvenDowideit/dhe-documentation-master-pr 
Dhe documentation master pr
Upstream-commit: 300a12f9aa44636bcad80549702f3dc57e3381e6
Component: engine
 2015-04-23 21:22:56 -07:00
Sven Dowideit 9d65fe4b0e Copy over the DHE documentation for release to docs.docker.com 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: b0ad95daa84354c4b41679d0182fafbd259e5a69
Component: engine
 2015-04-24 12:39:58 +10:00