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

15109 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brian Goff
8dc07af52f Merge pull request #12783 from duglin/Issue12763-LinkedEnvs 
A fix for = in env values in linked containers
 2015-04-27 10:50:14 -04:00
Doug Davis
325c0404c8 Merge pull request #12616 from cpuguy83/remove_uneeded_sleeps 
remove some uneeded sleeps in tests
 2015-04-27 10:42:40 -04:00
Brian Goff
9e0ffae864 remove some uneeded sleeps in tests 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-27 10:14:29 -04:00
moxiegirl
6cba3109c2 Merge pull request #12787 from epc/copyedits 
Copy edits for typos
 2015-04-26 10:40:18 -07:00
David Calavera
92f4bd59ce Merge pull request #12734 from sergey-alekseev/sergey-alekseev-patch-1 
Fix documentation typo in articles/basics.md
 2015-04-25 20:33:55 -07:00
Alexander Morozov
fefb836766 Merge pull request #12728 from HuKeping/addtest 
Add test for REST API container rename
 2015-04-25 17:01:10 -07:00
Ed Costello
fa9299f4c0 Copy edits for typos 
Signed-off-by: Ed Costello <epc@epcostello.com>
 2015-04-25 15:01:05 -04:00
Alexander Morozov
b5ccfca565 Merge pull request #12784 from duglin/RaceCommit 
Fix race condition in API commit test
 2015-04-25 10:03:03 -07:00
Doug Davis
cd4f507b42 Fix race condition in API commit test 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-25 05:46:47 -07:00
Doug Davis
bc149be69c A fix for = in env values in linked containers 
Closes: #12763

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-25 04:42:43 -07:00
Hu Keping
8f752ffeaf Add test for REST API container rename 
Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-04-25 17:19:57 +08:00
Sergey Alekseev
2188c8d2f4 Fix documentation typo in articles/basics.md 
Signed-off-by: Sergey Alekseev <sergey.alekseev.minsk@gmail.com>
 2015-04-25 11:32:17 +03:00
Alexander Morozov
272e612b65 Merge pull request #12744 from vdemeester/11603-pkg-archive-test-coverage-2 
Add coverage on pkg/archive (related to #11603)
 2015-04-24 22:12:01 -07:00
Phil Estes
6e9a6f5396 Merge pull request #12765 from LK4D4/registry_suite 
Implement DockerRegistrySuite in integration-cli
 2015-04-24 23:05:29 -04:00
Jessie Frazelle
c3ef6df9c3 Merge pull request #12699 from vbatts/vbatts-init_mnt_ns 
contrib/init: unshare mount namespace for inits
 2015-04-24 17:52:11 -07:00
Jessie Frazelle
9ad7145dae Merge pull request #12775 from Microsoft/12774-fixtypo 
Fixed typo 'configuring'
 2015-04-24 17:21:40 -07:00
John Howard
ae9905ef9c Fixed typo 'configuring' 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-04-24 16:52:32 -07:00
Alexander Morozov
602fd4e14b Merge pull request #12764 from LK4D4/not_protect_dangling 
Not protect dangling images for integration-cli
 2015-04-24 14:19:55 -07:00
Alexander Morozov
f696b1071a Implement DockerRegistrySuite in integration-cli 
To avoid manually creating and destroying registrys in tests.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-24 14:17:00 -07:00
Brian Goff
aa064621dd Merge pull request #12762 from ibuildthecloud/export-restart-parse 
Expose ParseRestartPolicy
 2015-04-24 16:30:18 -04:00
Alexander Morozov
9bea123bdd Not protect dangling images for integration-cli 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-24 13:16:51 -07:00
Brian Goff
b76bbae413 Merge pull request #12755 from LK4D4/use_f_for_remove 
Use -f for rm instead of kill before
 2015-04-24 15:34:38 -04:00
Darren Shepherd
366ee6bdfa 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>
 2015-04-24 12:23:54 -07:00
Alexander Morozov
887ad57cfa Use -f for rm instead of kill before 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-24 11:55:54 -07:00
Brian Goff
03719be830 Merge pull request #12754 from LK4D4/carry_12707 
fix runtime issue for TestEventsFilterContainer
 2015-04-24 14:36:58 -04:00
Doug Davis
700056cd4c Merge pull request #12753 from LK4D4/remove_all_images 
Implement teardown removeAllImages
 2015-04-24 14:16:04 -04:00
Daniel Antlinger
07795c3f5d fix runtime issue for TestEventsFilterContainer 
Signed-off-by: Daniel Antlinger <d.antlinger@gmx.at>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-24 10:48:40 -07:00
Alexander Morozov
a9688cdca5 Implement teardown removeAllImages 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-24 10:37:21 -07:00
Alexander Morozov
790c63a5ef Merge pull request #12502 from calavera/shallow_git_history 
Shallow clone using git to build images.
 2015-04-24 10:16:01 -07:00
David Calavera
1cfb307d70 Remove duplicated git clone logic. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-24 09:39:45 -07:00
David Calavera
8bd5a95e1e Document the extra depth argument in git contexts. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-24 09:39:39 -07:00
David Calavera
3117bf3ef5 Test that we set the right arguments for git cloning depending on the transport. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-24 09:39:38 -07:00
David Calavera
9fb7204a41 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:
4656bf47fc

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-24 09:39:38 -07:00
David Calavera
36fbf4b864 Shallow clone using git to build images. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-24 09:39:38 -07:00
Phil Estes
310fc37fe7 Merge pull request #12678 from vdemeester/fix-advanced-contributing-doc 
Documentation: fix the design proposal link in advanced contribution page
 2015-04-24 11:12:36 -04:00
Vincent Demeester
c21d408ad2 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>
 2015-04-24 17:03:33 +02:00
Fred Lifton
300a12f9aa Merge pull request #12729 from SvenDowideit/dhe-documentation-master-pr 
Dhe documentation master pr
 2015-04-23 21:22:56 -07:00
Sven Dowideit
b0ad95daa8 Copy over the DHE documentation for release to docs.docker.com 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-04-24 12:39:58 +10:00
Sven Dowideit
493437616d make space for DHE menu item again 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-04-24 12:39:49 +10:00
Brian Goff
016a2d6d9d Merge pull request #12587 from coolljt0725/add_cpu_cfs_quota_to_build 
Add cpu cfs quota to build
 2015-04-23 21:28:46 -04:00
Lei Jitang
5f4fb8be00 Add cpu cfs quota to build 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-04-24 08:54:08 +08:00
moxiegirl
09052a5572 Merge pull request #12712 from moxiegirl/carry-docs-update-9397 
Removing firewalld info
 2015-04-23 17:24:27 -07:00
Jessie Frazelle
9d94d91ea7 Merge pull request #12569 from kostickm/12449-check-statusCode 
Fixing statusCode checks for sockRequest
 2015-04-23 17:13:06 -07:00
Michael Crosby
c26695cf8a Merge pull request #12659 from dqminh/exec-interactive-hang 
reuse same code for setting pipes in run/exec
 2015-04-23 16:37:49 -07:00
Jessie Frazelle
2ebfc7c874 Merge pull request #12710 from runcom/bye-engine-from-graph 
Remove engine/job from graph
 2015-04-23 15:42:50 -07:00
Megan Kostick
c7845e27ee Fixing statusCode checks for sockRequest 
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
 2015-04-23 15:35:56 -07:00
Fred Lifton
b830b823cd Merge pull request #12711 from Shopify/fix_doc 
[docs] small markup fix
 2015-04-23 15:07:46 -07:00
Daniel, Dao Quang Minh
ade8146aa8 reuse same code for setting pipes in run/exec 
This also moves `exec -i` test to _unix_test.go because it seems to need a
pty to reliably reproduce the behavior.

Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
 2015-04-23 21:54:21 +00:00
Antonio Murdaca
fa2c68a89e Remove engine/job from graph 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-23 23:36:29 +02:00
Alexander Morozov
96ef1bd29c Merge pull request #12709 from vdemeester/12705-remove-defer-deleteContainer 
delete "defer deleteContainer" on tests
 2015-04-23 14:34:23 -07:00