8c0a231700
Merge pull request #14578 from mountkin/fix-rmi-image-not-found
...
don't allow deleting the image of running containers
Upstream-commit: 15cb7dfc9ecb4600fc514ceef478f8b8ea631b36
Component: engine
2015-07-16 18:02:51 -07:00
d9e652a366
Update libcontainer
...
Replaced github.com/docker/libcontainer with
github.com/opencontainers/runc/libcontaier.
Also I moved AppArmor profile generation to docker.
Main idea of this update is to fix mounting cgroups inside containers.
After updating docker on CI we can even remove dind.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: c86189d554ba14aa04b6314970d3699e5ddbf4de
Component: engine
2015-07-16 16:02:26 -07:00
d192eb2289
Merge pull request #14620 from hqhq/hq_cgroup_ro_optional
...
Remove cgroup read-only flag when privileged
Upstream-commit: 8801906cedb73f171a8556294e78d649fee3db32
Component: engine
2015-07-16 16:00:02 -07:00
b49d8006b0
Windows: hostconfig on start
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 39ad38ccf928882171e38c866e61506d1a98508c
Component: engine
2015-07-16 15:33:13 -07:00
a1797b4d94
Merge pull request #14690 from LK4D4/update_libnetwork
...
Update libnetwork
Upstream-commit: 5d3043649a6ffc35fbc48d19b0ccccb60d305b8a
Component: engine
2015-07-16 15:13:24 -07:00
12460b884d
Separate plugin sockets and specs.
...
Check if there is a plugin socket first under `/run/docker/plugins/NAME.sock`.
If there is no socket for a plugin, check `/etc/docker/plugins/NAME.spec` and
`/usr/lib/docker/plugins/NAME.spec` for spec files.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 6c0795747b00589641eb34eb7adce05a56d8840f
Component: engine
2015-07-16 14:20:07 -07:00
8f72c020f5
Update github.com/docker/libnetwork to 2a5cb84758b5115d99d8f82c84845417c6c345a3
...
This update includes removal of libcontainer dependency.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: b84ceb3d0ac53690f19cfc05f6b0e91e1998aa41
Component: engine
2015-07-16 13:58:38 -07:00
78ef36e1cb
Windows: Hook up user supplied MAC
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: a207ce6ae4e76a69c543cee7e10cb88bbc2c2460
Component: engine
2015-07-16 13:20:14 -07:00
8755c824aa
Merge pull request #14664 from calavera/fix_load_tag_with_digest
...
Check if a tag name to load is a valid digest.
Upstream-commit: 212525f951d9c92ad4cbf7628e7024930da080ac
Component: engine
2015-07-16 12:46:05 -07:00
49b7af2492
Windows: Vendor hcsshim@f674a70f1306dbe20b3a516bedd3285d85db60d9
...
Signed-off-by: John Howard <John.Howard@microsoft.com >
Upstream-commit: 83ad0536c130cbd0705cec27866ff4f770923912
Component: engine
2015-07-16 12:07:20 -07:00
186b6eae49
Merge pull request #13375 from tiborvass/distribution-refactor
...
Vendor distribution client v2
Upstream-commit: 5365e6b463b7b528b61040d68c9e55210452a89a
Component: engine
2015-07-16 11:54:08 -07:00
98b526f041
Check if a tag name to load is a valid digest.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 1ec25653d87fa86517a319992ee89eb3e5ee1223
Component: engine
2015-07-16 10:53:56 -07:00
1492d5ce64
Update graph to use vendored distribution client for the v2 codepath
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 19515a7ad859b28c474d81e756ac245afcd968e3
Component: engine
2015-07-16 13:13:47 -04:00
0a78587632
remove pkg/transport and use the one from distribution
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 276c640be4b4335e3b8d684cb3562a56d3337b39
Component: engine
2015-07-16 13:13:46 -04:00
d5bd1836f1
Vendor docker distribution registry client and dependencies
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 745820fec0faba80b1e0df9c236c6181930647db
Component: engine
2015-07-16 13:13:46 -04:00
4689740e7d
Merge pull request #14679 from tiborvass/fix-docker-py-search-test
...
Fix issue where Search API endpoint would panic due to empty AuthConfig
Upstream-commit: 48a01a317c14513b4d8452f2932bf80379d7a11b
Component: engine
2015-07-16 13:12:31 -04:00
f26a2613c1
Fix issue where Search API endpoint would panic due to empty AuthConfig
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: b32c4cb4594bb27496e4f75163b7a1ed93fd06bd
Component: engine
2015-07-16 12:38:44 -04:00
89efa010e2
Merge pull request #14571 from charleswhchan/patch-2
...
Documentation: Split apt-get example onto multiple lines
Upstream-commit: 8c77e3962777f4f693de7b4b064aac20306e4a4b
Component: engine
2015-07-16 18:32:56 +02:00
0a1451759e
Merge pull request #14623 from HuKeping/refactor-dockercmd
...
Refactor : Use dockerCmd in integration-cli tests
Upstream-commit: ac8299ae15ed5dd11543cd226ce1e32ea54c1b56
Component: engine
2015-07-16 09:24:59 -07:00
f429ebce66
Refactor : Use dockerCmd in integration-cli tests
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 71868228c787f54501abec6556364d2ceaa4e645
Component: engine
2015-07-17 04:07:12 +08:00
c4cef0431e
Merge pull request #14604 from Microsoft/10662-addbridge
...
Windows: Plumb through -b on daemon
Upstream-commit: 97515a35ca4c91f1a1444f73f5fe9385a94f1dd1
Component: engine
2015-07-16 08:44:40 -07:00
abf0842b64
Add missing 'Names' field to /containers/json API output
...
Closes #14675
Wasn't sure how far back I needed to go so I did just a few.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 081991c01e13c60af725bea91c4f5598dbcceaa9
Component: engine
2015-07-16 08:23:55 -07:00
573d9d9c73
Merge pull request #14670 from chenchun/fix_fluentd_link
...
Fix fluentd link name
Upstream-commit: b70428c4dd3c13a5903f6a3312396ae95ea916a3
Component: engine
2015-07-16 10:44:54 -04:00
d93b5bc4ca
Split apt-get example onto multiple lines. Use extra spaces to align the code block.
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: c4d2b34d13ac61d6c2b9caa2270763259e6c788c
Component: engine
2015-07-16 06:42:07 -07:00
9b0a67a80d
Updated usage information because of removed short parameters.
...
Signed-off-by: Robin Schneider <ypid@riseup.net >
Upstream-commit: 397de38ae68ed580dccae1421bd02bfedd4ababa
Component: engine
2015-07-16 10:44:58 +02:00
38cf42fe8e
Fix fluentd link name
...
Signed-off-by: Chun Chen <ramichen@tencent.com >
Upstream-commit: ed23ecd305a063088bb22bcb4b4feaf1d46a79b4
Component: engine
2015-07-16 14:23:56 +08:00
fa4cacc2ff
don't allow deleting the image of running containers
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: ce6410cd4ccdf3b0d2b9a1bdd0166d4989a88300
Component: engine
2015-07-16 13:14:48 +08:00
a485469253
Trim excess from image. Based on the context, the email itself is sufficient.
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: f373bd97c3d1626563b20611947705e3bd00ac80
Component: engine
2015-07-15 20:15:57 -07:00
89b6e2370a
Merge pull request #14661 from LK4D4/vet_warns
...
Fix some formatting calls
Upstream-commit: cd642973fa50531d3da6c13eb0255b6f4cc8aa9c
Component: engine
2015-07-15 16:41:18 -07:00
70bd19afc1
Merge pull request #13993 from Ramzec/index_iteration
...
graph: use truncindex consistently to iterate graph entries
Upstream-commit: a81dcaef93889a2a62b85a5040fb6b5d04633396
Component: engine
2015-07-15 16:39:59 -07:00
4ee32ba904
Add release-deb & release-rpm scripts.
...
These will create the apt & yum repos for the deb/rpms generated by build-deb
and build-rpm.
Adds sign-repo script which signs the repo metadata with a gpg key.
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: c850e97c84abffc71509692ab1accd38408fa51b
Component: engine
2015-07-15 15:54:00 -07:00
c40c00082a
Remove reviewing process from MAINTAINERS
...
The pull request reviewing process and labeling strategy is described as
part of a dedicated file in `project/REVIEWING.md`: remove the existing
description from the `MAINTAINERS` file.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 57c43960f87492a70045fac0d2ff164a3f4f45f7
Component: engine
2015-07-15 13:56:04 -07:00
8396257751
Document reviewing process and labels
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 6157937f67f36df5338c2997b0278d67b9eee9ad
Component: engine
2015-07-15 13:14:21 -07:00
13b2b9e4b5
add tianon's suites.sh file
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 4a5fd6c0f9014456e70a369c5b31e3edb3b8d5a1
Component: engine
2015-07-15 12:48:49 -07:00
46a0415407
Fix some formatting calls
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: a5142f6ac31c6c21b96c6895fff525c46e8056a6
Component: engine
2015-07-15 12:25:50 -07:00
23dc4e4dc4
Merge pull request #14332 from ankushagarwal/failedLogin
...
Add 500 check for registry api call
Upstream-commit: 46aea60fb0f52aba4281f742d263ee7a5eab3b98
Component: engine
2015-07-15 11:19:31 -07:00
28d39d6dba
Merge pull request #14624 from vdemeester/14603-dockerCmd-integration-cli-1
...
Integration test refactors to use dockerCmd
Upstream-commit: e98a8815704c4c4007d45a88f88ab6a45959066e
Component: engine
2015-07-15 14:03:58 -04:00
b069af9e3e
Merge pull request #14555 from sdurrheimer/master
...
Zsh completion updates and improvements
Upstream-commit: 386f11a63dec0f918e5d118bb5835ddde56a7b41
Component: engine
2015-07-15 10:40:41 -07:00
452bc45484
Merge pull request #14655 from duglin/CleanupBuild
...
Cleanup build tmp dir stuff
Upstream-commit: 308ecafad87b5ef9921a8ff2c471f4b410b35107
Component: engine
2015-07-15 09:42:24 -07:00
e35527ad92
Merge pull request #14643 from dmcgowan/fix-canonical-repo-info
...
Set canonical name correctly
Upstream-commit: e46c7060cccb55320ceb2596743f4b57a8ca6a03
Component: engine
2015-07-15 09:39:01 -07:00
ca3f505d91
Merge pull request #14636 from calavera/bump_changelog
...
Bump changelog from 1.7.1
Upstream-commit: e0728035fe09bb6fc4fea03c57a3c241dc055fa8
Component: engine
2015-07-15 08:56:03 -07:00
74e43d3bad
Merge pull request #14657 from anatolyborodin/typo_fix
...
Fix a typo: change "such Bash" to "such as Bash" in dockerfile_best-practices.md
Upstream-commit: 39e380b97a0d7b5b951225135267c6097f1667e5
Component: engine
2015-07-15 11:29:38 -04:00
72b29b511a
Fix a typo: change "such Bash" to "such as Bash"
...
Signed-off-by: Anatoly Borodin <anatoly.borodin@gmail.com >
Upstream-commit: 5f9d1bc01876d31258bf2f86c6c2d9938eb680a9
Component: engine
2015-07-15 17:10:22 +02:00
401d7f8361
Merge pull request #14644 from charleswhchan/patch-4
...
Remove duplicated period in link
Upstream-commit: 1df7a2f940d7c5836fe771211c9566d6bcdfc71b
Component: engine
2015-07-15 10:34:01 -04:00
4f73cb3ecd
Cleanup build tmp dir stuff
...
If there's an error while unpacking the build context then we weren't erasing
the tmp dir created to persist the context.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 13c08b898b1ad26dda2900c90314afa0bd2d3a1f
Component: engine
2015-07-15 06:23:19 -07:00
c446ba7ae7
Merge pull request #14574 from SvenDowideit/elastic-ip-webhooks
...
Trusted build servers moved to AWS and use an elastic IP
Upstream-commit: a031b6476c219bdcf604857c2cac481c8aef517d
Component: engine
2015-07-15 12:20:50 +10:00
79e7cafd39
Trusted build servers moved to AWS and use an elastic IP
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 174870e64fbaf3e949ee8d6e874548bc2af26811
Component: engine
2015-07-14 19:20:09 -07:00
4289aab700
Merge pull request #14584 from Jason-Green-Aver/patch-1
...
Add missing periods to elements in ROADMAP.md
Upstream-commit: 8e7f2fc2e7cb95dc6639ec261118307618c2e486
Component: engine
2015-07-15 12:01:31 +10:00
98b7ddb8da
Merge pull request #14635 from jfrazelle/update-rpm-url
...
update urls for rpms
Upstream-commit: 35746ef97f1c8c54702b066745569241773f368e
Component: engine
2015-07-14 18:04:17 -07:00
835deb271a
Remove duplicated period in link
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: 3a23203255e75cdfca608f19be93b08bb260692e
Component: engine
2015-07-14 17:50:19 -07:00
