Commit Graph

100 Commits

Author SHA1 Message Date
32e08b641b Merge pull request #14966 from mrjana/vendor18
Vendoring libnetwork
Upstream-commit: 5bdd4d0ec46ab071bbb633dde60b97b28911ade6
Component: engine
2015-07-24 17:58:23 -07:00
2e3d5aed9b Vendoring libnetwork
Vendoring libnetwork commit f1c5671f1ee2133055144e566cd8b3a0ae4f0433

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 2ad81da856c123acf91eeff7ab607376bd27d9ba
Component: engine
2015-07-24 17:11:47 -07:00
6e333c54df Vendor notary
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: f5a4a8da15f5cbe6abf8d7b67211c75791c78ebf
Component: engine
2015-07-24 01:31:50 -07:00
f7a16948b8 Do Docker edits so we can use the new distribution code
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: b874ef8f43754e5c0fe40b90c3533db93491753e
Component: engine
2015-07-23 10:24:46 -07:00
ba54a4bec5 Vendor latest distributions so we can use the new errcode stuff
ping @stevvooe @RichardScothern

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 8b69552b50b0811db077b4bc2583d167e7c8aaec
Component: engine
2015-07-23 10:24:46 -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
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
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
8e13e89b0b Merge pull request #14537 from stevvooe/allow-one-character-repository-names
Allow one character repository names
Upstream-commit: 9264d384244d7334a45c4e3d46c639683993a077
Component: engine
2015-07-10 15:41:53 -07:00
6198a7df78 Update docker/distribution dependency
Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: bfd5202c17969d728e69972ad6adaf2aa7c79a91
Component: engine
2015-07-10 14:05:38 -06:00
a7342fdac1 Vendoring libnetwork
Vendoring libnetwork commit: 8fb0a8bc9e3166216ca3da2d0bb15332f6685745
    - Fixes breakage in k/v store handling logic in experimental
    - Adds back all the fixes that went in 1.7.1 to master
    - Change VXLAN port in overlay driver to IANA assigned port

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: c6dc6bcbb8d7e9caa0ef9e75e4d223cf310dad9f
Component: engine
2015-07-06 20:53:03 -07:00
afa4fd55b8 Import latest libnetwork
- To bring in interface which retrieves endpoint statistics

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 126b1b2923286b3baf57d7a4575863be5cf67c7a
Component: engine
2015-06-30 14:16:16 -07:00
5ec67f98b1 Fix endpoint leave failure for --net=host mode
When a container is started with `--net=host` with
a particular name and it is subsequently destroyed,
then all subsequent creations of the container with
the same name will fail. This is because in `--net=host`
the namespace is shared i.e the host namespace so
trying to destroy the host namespace by calling
`LeaveAll` will fail and the endpoint is left with
the dangling state. So the fix is, for this mode, do
not attempt to destroy the namespace but just cleanup
the endpoint state and return.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 9bb69f9726e7f8cba0cdf681e5060e47b9c45298
Component: engine
2015-06-24 12:33:52 -07:00
4a5258148d Vendoring in libnetwork for native multihost networking
- brings in vxlan based native multihost networking
- added a daemon flag required by libkv for dist kv operations
- moved the daemon flags to experimental

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 508065a7adc84e5e63f47b00c379dad6a79d3c5e
Component: engine
2015-06-22 04:15:41 -07:00
4c8d2626b0 register libnetwork API and UI with docker parent chain
This commit also brings in the ability to specify a default network and its
corresponding driver as daemon flags. This helps in existing clients to
make use of newer networking features provided by libnetwork.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: da5a3e6dee80f1f5d4059851e4762ffb0484f7e9
Component: engine
2015-06-18 12:07:58 -07:00
587729eda0 Updates libcontainer to v2.2.1
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Upstream-commit: 6d022bda3bddb930948fec99ad35c402ac79e8f7
Component: engine
2015-06-15 18:18:38 -04:00
57eb64c9c0 Carry of PR #13520
Removinig files

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: cd44018856be421497a35d96f88dd0eec42fae43
Component: engine
2015-06-13 09:27:30 -07:00
7832a73409 Vendoring in libnetwork to 3be488927db8d719568917203deddd630a194564
This PR brings the vendored libnetwork code to
3be488927db8d719568917203deddd630a194564, which pulls in quite a few
fixes to support kvstore, windows daemon compilation fixes,
multi-network support for Bridge driver, etc...

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 083300168fb0f42e022e9fa2ce47a7b2aac9967a
Component: engine
2015-06-12 16:10:40 -07:00
b983713c50 Vendoring in libnetwork to fix #13873.
Libnetwork sha# e578e95aa101441481411ff1d620f343895f24fe

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: f3d1826350d5624f1e82d764d2367a4584f04465
Component: engine
2015-06-12 04:58:37 -07:00
1e82333db2 Update "vendor/"
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: b0d748325f1eaae8d4f138b5785307cef2a784d3
Component: engine
2015-06-11 09:59:12 -07:00
54c658c51c Vendoring libnetwork to fix stale arp cache issue
Vendoring in libnetwork 90638ec9cf7fa7b7f5d0e96b0854f136d66bff92

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 386ab251372a40e895115e7a927d349412cf9d89
Component: engine
2015-06-10 19:29:10 -07:00
0ae1820eeb Merge pull request #13784 from mrjana/cnm_integ
libnetwork: Add garbage collection trigger
Upstream-commit: 4750e1f77ef1f42f8b826f7314ec4c2b3f7a4f34
Component: engine
2015-06-09 17:24:30 -07:00
c35a83dbe6 Update libcontainer to v2.1.1
It includes fix for mounting / as volume on SELinux.
docker/libcontainer#619

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 38acd31e8a99ef043f9a5cf84f968ebebc31614e
Component: engine
2015-06-09 13:54:57 -07:00
2ee4e129d1 libnetwork: Add garbage collection trigger
When the daemon is going down trigger immediate
garbage collection of libnetwork resources deleted
like namespace path since there will be no way to
remove them when the daemon restarts.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: c68e7f96f9636a9b2ab0c2c0dbf753161fa73fc2
Component: engine
2015-06-07 21:33:51 -07:00
bda4b578b4 Fix for #13720
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: ea180a73bc00491915d620c14877318cc33b2a73
Component: engine
2015-06-03 23:39:27 -07:00
5ce5df9c4d Update vendoring
Update libnetwork to 005bc475ee49a36ef2ad9c112d1b5ccdaba277d4
Synchronize changes to distribution (was missing _test.go file)

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 1664d6cd66c48dce5628cb67c1bdf5c7c2395d53
Component: engine
2015-06-02 16:41:02 -07:00
bd2c53758a Merge pull request #13668 from calavera/bump_libnetwork
Bump libnetwork for 1.7 release.
Upstream-commit: 63b5d5fadc9fa6ac9dd93c8553030d84e7ac741f
Component: engine
2015-06-02 15:04:38 -04:00
01c69f98c5 Update libnetwork to 4ded6fe3641b71863cc5985652930ce40efc3af4
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: ad244668c3db521626e65fd9c2a4468f35a7b0bc
Component: engine
2015-06-02 11:30:36 -07:00
395ceacd61 Properly verify manifests and layer digests on pull
To ensure manifest integrity when pulling by digest, this changeset ensures
that not only the remote digest provided by the registry is verified but also
that the digest provided on the command line is checked, as well. If this check
fails, the pull is cancelled as with an error. Inspection also should that
while layers were being verified against their digests, the error was being
treated as tech preview image signing verification error. This, in fact, is not
a tech preview and opens up the docker daemon to man in the middle attacks that
can be avoided with the v2 registry protocol.

As a matter of cleanliness, the digest package from the distribution project
has been updated to latest version. There were some recent improvements in the
digest package.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 06612cc0fee103bf6f46429e3cd572725ef72948
Component: engine
2015-05-29 15:20:28 -07:00
d6425cf5ab Merge pull request #13482 from boucher/criu-libcontainer-update
Update vendored libcontainer
Upstream-commit: 6d8e517bce90866abcf311cd5cc079ad8cce2a86
Component: engine
2015-05-29 10:28:58 -07:00
9218287317 Vendoring in libnetwork 2da2dc055de5a474c8540871ad88a48213b0994f
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: d429465b37b29f72109e373379580f020d3ff9ee
Component: engine
2015-05-28 00:04:01 +00:00
9181b59d85 Update vendored libcontainer to v2.1
Docker-DCO-1.1-Signed-off-by: Ross Boucher <rboucher@gmail.com> (github: boucher)
Upstream-commit: 4509f91b26869500dd0d7ea6858e03b1b00eef5d
Component: engine
2015-05-26 12:47:57 -07:00
2f63354a90 Vendoring in libnetwork 67438080724b17b641b411322822c00d0d3c3201
This version brings in upto-date important bug-fixes from libnetwork

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: a3d22c764cfc3e175cdfb992f3b2314f23540236
Component: engine
2015-05-23 18:42:34 -07:00
6fda96cea6 Fix network connectivity problem for non-root users
If a container was started with a non-root user the container
may not be able to resolve DNS names because of too restrictive
permission in the /etc/resolv.conf container file. This problem
is in how this file gets created in libnetwork and ths PR
attempts to fix the issue by vendoring in the libnetwork code
with the fix.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: afd901e408d8d4ed00707c545ae985bc637a1979
Component: engine
2015-05-20 17:51:20 +00:00
769fee3fba Vendoring in libnetwork, netns, netlink
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 272f8cd4bc537bd78e7bf02d5b06fac50afda8ff
Component: engine
2015-05-19 22:40:18 +00:00
eaedb9b85a Update libcontainer to a37b2a4f152e2a1c9de596f54c0
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 87c35d0e0af930d1c7ac03f852287348f7f9d240
Component: engine
2015-05-13 13:55:26 -07:00
2e6e1769a6 Update "hack/vendor.sh" to be more explicit
Previously, we've taken advantage of the fact that libcontainer's `update-vendor.sh` is the same syntax as Docker's `vendor.sh` with some shell magic.  This changes that to copy libcontainer's dependencies into this file explicitly so that we can scale to more projects with varying methods of vendoring (assuming they don't use import re-writing, which screws up everyone).

We'll need to stay diligent in making sure this list matches what's in libcontainer's `update-vendor.sh` (minus the not-required codegangsta/cli dep), but that's a fair trade-off for being able to scale our dependency model better (and track new discrete dependencies more directly).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: b919dee8347a47763d576136254bcbc922ef4c57
Component: engine
2015-05-07 17:43:11 -06:00
f61181dd2f Update libcontainer to 1b471834b45063b61e0aedefbb1
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 2f54c1a352e23de04a4535d0fc1bd0cad66c7c15
Component: engine
2015-05-07 14:43:39 -07:00
fccc1b566d Update libcontainer and make it the source of truth on logrus version
To help avoid version mismatches between libcontainer and Docker, this updates libcontainer to be the source of truth for which version of logrus the project is using.  This should help avoid potential incompatibilities in the future, too. 👍

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 80a895142e7101b44ff71910bb2da994b1cc4f5f
Component: engine
2015-05-04 11:02:44 -06:00
f10bd173bd Merge pull request #11478 from dmcgowan/v2-vendored-api
Use v2 api from distribution
Upstream-commit: 563041b5c4acaca8e6ebb8fb4e81a3e7e7c37e81
Component: engine
2015-04-10 17:22:38 -04:00
9f318dd3e8 Update libcontainer to bd8ec36106086f72b66e1be85a81202b93503e44
Fix #12130

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 2f853b94931057d8ebcd6e21f7656d3a04e2acf4
Component: engine
2015-04-07 15:10:44 -07:00
54f3509eb1 Update libcontainaer to d00b8369852285d6a830a8d3b9
Fixes #12015

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: d12fef1515cb3f0938ea6ed8cab8351e2df2753e
Component: engine
2015-04-02 14:12:55 -07:00
b6e329b9fe Vendor distribution v2 api
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: f011d722ce2ec7ef00654130f7f4ff8d295f025f
Component: engine
2015-03-31 14:58:45 -07:00
477d0f5d83 Update libcontainer to c8512754166539461fd860451ff
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 17ecbcf8ff051575928a6e9fb13be0b034b3090d
Component: engine
2015-03-30 16:29:10 -07:00
645e076e86 Update libcontainer to a6044b701c166fe538fc760f9e2
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: b4196f7892f4aeb11318bbd6c2d68227868e27e2
Component: engine
2015-03-25 11:32:14 -07:00
fa9aab1c43 Update libcontainer to fd0087d3acdc4c5865de1829d4a
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: e321ec980708b052fd788b41af97f875630cda9c
Component: engine
2015-03-23 14:14:20 -07:00
67dd189d62 Update libcontainer to 4a72e540feb67091156b907c4700e580a99f5a9d
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Upstream-commit: 60ef4ae6fcb015546a646eb3b613344a9c4fc27b
Component: engine
2015-03-19 14:42:23 -04:00
eec8373c1c Revert "correct comment errors for netlink_linux.go"
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: d173669fdff8ec1acc33d2da28e2a473a3844e56
Component: engine
2015-03-19 14:38:00 +02:00
d2b7fa6417 correct comment errors for netlink_linux.go
Signed-off-by: s00318865 <sunyuan3@huawei.com>
Upstream-commit: c5fdc93f89db3cb3ea4489999296487fad0f440d
Component: engine
2015-03-19 20:29:30 +08:00
b16d50a307 Correctly close pipe after error in tarsum verification
This addresses a subtle deadlock where an error during a copy prevented pipe
closure to propagate correctly. By closing down the read end of the pipe rather
than the write end, the waiting writer is properly signaled. A nice side-effect
of this change is that errors encountered by io.Copy are now propagated to the
verifier's Write method.

A test to ensure validation errors for unsupported digest types has been added,
as well.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 0306a41909175b467d08ebc97d4c5136ca9e7ebd
Component: engine
2015-03-18 19:07:55 -07:00