8a425b30fb
Merge pull request #14693 from LK4D4/update_libcontainer
...
Update libcontainer
Upstream-commit: 98ed9a55f42f7c86c7c9cddb27f6807e7e77c889
Component: engine
2015-07-17 13:02:04 -07:00
63fd915fb7
Merge pull request #13680 from jfrazelle/new-apt-yum-repos
...
WIP: new apt yum repos for release scripts
Upstream-commit: 25d9f38852173950a4a4192746a56bef39b24fd9
Component: engine
2015-07-17 12:29:21 -07:00
4daf251bed
Merge pull request #13951 from calavera/plugins_path
...
Separate plugin sockets and specs.
Upstream-commit: a763637eae7dcf5d870e9d035be5baf94d72e2c5
Component: engine
2015-07-17 21:11:31 +02:00
2d196d14b3
Merge pull request #14709 from rhvgoyal/base-size-100G
...
devicemapper: Change default basesize to 100G
Upstream-commit: e939a3003910c705a662e53ee3c47aa718d25fa1
Component: engine
2015-07-17 12:41:28 -04:00
b8696f7d26
Merge pull request #14685 from Microsoft/10662-revendorhcsshim
...
Windows: Revendor hcsshim@f674a70f1306dbe20b3a516bedd3285d85db60d9
Upstream-commit: fb34537a9963b3fc3aa9c74046becbc90a1cba07
Component: engine
2015-07-17 12:31:58 -04:00
124ac833af
Merge pull request #14708 from icecrime/14445_remove_workflow_from_maintainers
...
Remove reviewing process from MAINTAINERS
Upstream-commit: 97be366961ed31dd399d8cbb9f576a4a4e2a3f2b
Component: engine
2015-07-17 09:03:53 -07:00
0bd2cb4373
Merge pull request #14445 from icecrime/reviewing_process_and_labels
...
Document and adjust reviewing process and labels
Upstream-commit: ff05f9c285175eedfb663e0d4b7bd7cca29d7be3
Component: engine
2015-07-17 08:25:41 -07:00
4b2f3f5f76
Merge pull request #14605 from brahmaroutu/gccgo_scheduler
...
Go Scheduler issue with sync.Mutex
Upstream-commit: 7b83b0e15c4507871ed411aca5610aa7da751bd9
Component: engine
2015-07-17 08:16:32 -07:00
5fc55316cd
devicemapper: Change default basesize to 100G
...
Current default basesize is 10G. Change it to 100G. Reason being that for
some people 10G is turning out to be too small and we don't have capabilities
to grow it dyamically.
This is just overcommitting and no real space is allocated till container
actually writes data. And this is no different then fs based graphdrivers
where virtual size of a container root is unlimited.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
Upstream-commit: 424d5e55a2f863b8eadab578e3ba647de09a4354
Component: engine
2015-07-17 11:10:23 -04:00
e191f54133
Add missing space
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: ceca4109fac5367f7c354b675cadf086dc1e09c3
Component: engine
2015-07-16 22:49:46 -07:00
63609ba888
Merge pull request #14698 from duglin/AddErr
...
Add missing 'err' to Fatalf to help debug an issue
Upstream-commit: ac3f7c71b8e82b5faf014b13138219723f6a0c67
Component: engine
2015-07-16 21:42:42 -07:00
d7c4893fc7
Add missing 'err' to Fatalf to help debug an issue
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 97c5f64001af1ac6c9035af672e45051cab55f62
Component: engine
2015-07-16 20:27:14 -07:00
d905b9673f
Go Scheduler issue with sync.Mutex using gccgo
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 9ca913d0f168d943f6e15f32f52f777732b354a7
Component: engine
2015-07-17 01:33:58 +00:00
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
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
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
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
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
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
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
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
Arnaud Porterie
David Calavera
Sebastiaan van Stijn
Brian Goff
Jessie Frazelle
Vivek Goyal
Charles Chan
Alexander Morozov
Doug Davis
root
Alexander Morozov
Stephen Day
John Howard
Derek McGowan
Tibor Vass
Tibor Vass
Hu Keping
James Turnbull
Chun Chen
Shijiang Wei
Jessica Frazelle
Anatoly Borodin