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
Ankush Agarwal
29a3bbf2b3
Eliminate json.Marshal from graph/export.go and volumes/volume.go
...
Fixes #12531
Fixes #12530
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
2015-04-24 15:40:21 -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
Anton Tiurin
11a5f1af01
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>
2015-04-24 21:07:48 +03: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
Aleksa Sarai
b7c3c0cb69
*: 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)
2015-04-25 00:10:29 +10:00
Aleksa Sarai
4377ebd6a7
*: 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)
2015-04-24 23:53:47 +10: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
Qiang Huang
667b1e220c
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>
2015-04-24 08:43:44 +08:00
Ma Shimiao
66acef865d
clean up viz code
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-04-24 08:38:14 +08:00
Qiang Huang
47e5acfbae
add devices cgroup check and errors
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-04-24 08:37:59 +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
Florian Weingarten
55d1ac645c
[docs] fix formatting issue
...
Signed-off-by: Florian Weingarten <flo@hackvalue.de>
2015-04-23 21:17:12 +00:00