toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,476 Commits 3 Branches 295 Tags
b1b57c9cd41beebc3b2b84ae00a5d028eb0373b0
Commit Graph
15476 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Aleksa Sarai f124bc620f *: switch to Get(Root)?ResourcePath where appropriate 
Several parts of the codebase didn't use the correct path sanitisation
wrappers. Now that the wrappers have been exposed, use those.

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
Upstream-commit: b7c3c0cb6988c9a7864649bfe458217336c5fc51
Component: engine
 2015-04-25 00:10:29 +10:00
Aleksa Sarai 0e89e62feb *: expose getResourcePath and getRootResourcePath wrappers 
Due to the importance of path safety, the internal sanitisation wrappers
for volumes and containers should be exposed so other parts of Docker
can benefit from proper path sanitisation.

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
Upstream-commit: 4377ebd6a758278c1766006c7eb8b777fa175719
Component: engine
 2015-04-24 23:53:47 +10: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
Sven Dowideit be8a515938 make space for DHE menu item again 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 493437616d1aabef50768d71ce786595f7295554
Component: engine
 2015-04-24 12:39:49 +10:00
Brian Goff 842343c83d Merge pull request #12587 from coolljt0725/add_cpu_cfs_quota_to_build 
Add cpu cfs quota to build
Upstream-commit: 016a2d6d9d215f26f2b2b11ddac4e36c6c93e1c9
Component: engine
 2015-04-23 21:28:46 -04:00
Lei Jitang 734115a06e Add cpu cfs quota to build 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 5f4fb8be006c0ffeff2671e5752111e543e07d9f
Component: engine
 2015-04-24 08:54:08 +08:00
Qiang Huang 22db717a0c simplify memory limit check 
If memory cgroup is mounted, memory limit is always supported,
no need to check if these files are exist.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 667b1e220cf82fb77fd776426a4b712ae5fee0ae
Component: engine
 2015-04-24 08:43:44 +08:00
Ma Shimiao 8910bbac66 clean up viz code 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 66acef865d7504605572b0d9566d9e250cf19bc2
Component: engine
 2015-04-24 08:38:14 +08:00
Qiang Huang af1b9c60d9 add devices cgroup check and errors 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 47e5acfbaefc45e536b953af6bf8a3993669c816
Component: engine
 2015-04-24 08:37:59 +08:00
moxiegirl 85c05759af Merge pull request #12712 from moxiegirl/carry-docs-update-9397 
Removing firewalld info
Upstream-commit: 09052a55727d5686c06716b24bdfe13c469a7d26
Component: engine
 2015-04-23 17:24:27 -07:00
Jessie Frazelle d0722fddff Merge pull request #12569 from kostickm/12449-check-statusCode 
Fixing statusCode checks for sockRequest
Upstream-commit: 9d94d91ea7c9a8c5494ce6f208d96f27f6220c94
Component: engine
 2015-04-23 17:13:06 -07:00
Michael Crosby 558ffb7c99 Merge pull request #12659 from dqminh/exec-interactive-hang 
reuse same code for setting pipes in run/exec
Upstream-commit: c26695cf8a220bf33ba0efe729e2ab4b05089ea8
Component: engine
 2015-04-23 16:37:49 -07:00
Jessie Frazelle 34f1a568b5 Merge pull request #12710 from runcom/bye-engine-from-graph 
Remove engine/job from graph
Upstream-commit: 2ebfc7c874c26ab46fb93a2fca6fdcc9d2d808b1
Component: engine
 2015-04-23 15:42:50 -07:00
Megan Kostick 74db1507f9 Fixing statusCode checks for sockRequest 
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
Upstream-commit: c7845e27ee2b0462b01d043caeb771f21d5e4ac7
Component: engine
 2015-04-23 15:35:56 -07:00