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
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
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
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
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
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
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
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
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:
4656bf47fcdavid.calavera@gmail.com >
Upstream-commit: 9fb7204a41804131c2492f9d50d7451e123a05e5
Component: engine
2015-04-24 09:39:38 -07:00
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
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
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
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
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
5ec578ef0b
docker kill should return error if container is not running.
...
Assuming that docker kill is trying to actually kill the container
is a mistake. If the container is not running we should report it
back to the caller as a error.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Docker-DCO-1.1-Signed-off-by: Regan McCooey <rmccooey27@aol.com > (github: rmccooey27)
Docker-DCO-1.1-Signed-off-by: Regan McCooey <rmccooey27@aol.com > (github: rhatdan)
Upstream-commit: c92377e300d2e9863ffa8eda9c3166a039b60e09
Component: engine
2015-04-24 08:33:21 -04:00
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
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
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
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
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
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
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
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
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
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
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
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
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
41b25e1b54
Merge pull request #12711 from Shopify/fix_doc
...
[docs] small markup fix
Upstream-commit: b830b823cd4c8b45d68cef8cd1bbeb5d705d5262
Component: engine
2015-04-23 15:07:46 -07:00
0bd2f00743
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 >
Upstream-commit: ade8146aa82baa88bacdcf2d9c2559e8f47d71e4
Component: engine
2015-04-23 21:54:21 +00:00
41061500b4
Remove engine/job from graph
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: fa2c68a89e153cfc82c5af7cbb6d7f15b06e0a8c
Component: engine
2015-04-23 23:36:29 +02:00
b2b2217c8a
Merge pull request #12709 from vdemeester/12705-remove-defer-deleteContainer
...
delete "defer deleteContainer" on tests
Upstream-commit: 96ef1bd29c39404ba7bb668faecd691ed9f6c53d
Component: engine
2015-04-23 14:34:23 -07:00
33d9437505
[docs] fix formatting issue
...
Signed-off-by: Florian Weingarten <flo@hackvalue.de >
Upstream-commit: 55d1ac645cc36bb40046b2bcc400f8740ed2e86c
Component: engine
2015-04-23 21:17:12 +00:00
250a79f32d
Removing firewalld info
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: b6d8b65e5595304ef9b89f1f2ff2cae46c70dae9
Component: engine
2015-04-23 14:04:36 -07:00
249f3df46c
Merge pull request #9397 from jpopelka/9395-firewalld
...
Firewalld support
Upstream-commit: 259effc6dfd901130ca6d2926090bddfe35f7cdc
Component: engine
2015-04-23 16:58:08 -04:00
aa65355e58
Merge pull request #12417 from hashneo/patch-1
...
What if authConfig or factory is Nill?
Upstream-commit: 6b8d8a5847cc92ef8d96067da6b104b6e66ceaaf
Component: engine
2015-04-23 13:54:47 -07:00
0b2612ded7
Merge pull request #12509 from runcom/12499-racy-TestEventsImageImport
...
Fix TestEventsImageImport racy
Upstream-commit: b31d154294ed7a621de1b620f051cf9547c09385
Component: engine
2015-04-23 13:28:43 -07:00
1fa837ad6f
delete "defer deleteContainer" on tests
...
Since docker test suite is now using gocheck, ``defer
deleteContainer(…)`` is not needed anymore.
Fixes #12705
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: c5ef2901d8190b687e847ab17d306dae5af37b42
Component: engine
2015-04-23 22:27:46 +02:00
c2fd04b393
Merge pull request #12575 from brahmaroutu/integration_test7_12255
...
Move https tests as unit tests under client
Upstream-commit: 59ae92d55c4b074db31698c1bc05e2114dc3106c
Component: engine
2015-04-23 13:17:54 -07:00
88eea81abe
Merge pull request #12655 from jlhawn/fix_12281
...
Validate repo name before image pull
Upstream-commit: 68fc79f5924bc76111422eec5b7713a586febd96
Component: engine
2015-04-23 13:12:12 -07:00
1c64e12359
Merge pull request #11839 from brahmaroutu/template_11641
...
Allow go template to work properly with inspect …
Upstream-commit: 799cf056e7f672f987b0b44adf0868ce56caab8b
Component: engine
2015-04-23 13:07:40 -07:00
f84b67fdd0
Merge pull request #12674 from TomasTomecek/fix-v1-spec-typos
...
v1 spec: fix typos and formatting
Upstream-commit: 052cba7278a525078dff92ac0e2fed137ee5e9eb
Component: engine
2015-04-23 13:07:21 -07:00
0426fea7df
Merge pull request #12693 from runcom/fix-TestRenameStoppedContainer-race
...
Fix TestRenameStoppedContainer race
Upstream-commit: 036ade6c0548d85941e8c26306ac7c27105448ea
Component: engine
2015-04-23 13:04:36 -07:00
683e3fbf65
Merge pull request #12702 from LK4D4/good_ol_flushed
...
Return weird behaviour of returning json errors
Upstream-commit: 1492a7d7fd91e52a52937cafe1137330a89a910e
Component: engine
2015-04-23 13:03:29 -07:00
079bd06b02
Merge pull request #12577 from jfrazelle/actually-depreciate-rm
...
actually depreciate -rm insteam of --rm.. and a few others
Upstream-commit: c4914f071ffad203bc4ed16404f7ddc985a5f63e
Component: engine
2015-04-23 11:55:20 -07:00
fdbedc1a2a
Merge pull request #12636 from duglin/MoveConfig
...
Move CLI config processing out from under registry dir
Upstream-commit: 9ed5bfb083a8e848b43f5220ca89c82ea416a93b
Component: engine
2015-04-23 11:50:31 -07:00
8cb2465efc
Validate repo name before image pull
...
Checks for reserved 'scratch' image name.
fixes #12281
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: 18f46883851e47387ec2bd116940cdae97ba3c8d
Component: engine
2015-04-23 11:44:46 -07:00
38989f71ca
Merge pull request #12690 from rajdeepd/dry-run-test
...
Container API Test with HostName
Upstream-commit: 03e77e5c8fe90ee7620f2198d140eca7bed23ab8
Component: engine
2015-04-23 11:32:47 -07:00
68210d0ad0
Merge pull request #12692 from cpuguy83/fix_commit_test
...
Fix race with TestContainerApiCommit
Upstream-commit: 59acccb6f2dae4659797636196dfde7263789923
Component: engine
2015-04-23 11:31:27 -07:00
7362927093
Merge pull request #12703 from LK4D4/carry_12596
...
remove job from image_export
Upstream-commit: 2c70288ca60cde8844220c90306da8bf7728026f
Component: engine
2015-04-23 14:27:59 -04:00
