Commit Graph

167 Commits

Author SHA1 Message Date
7c6dc2bb99 Vendoring in vishvananda/netlink
Updating netlink package to 4b5dce31de6d42af5bb9811c6d265472199e0fec
to fix certain wierd netlink issues seen.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 7948b755c77a3901ffb5b397659c72ae4e6f4340
Component: engine
2015-08-14 18:02:58 -07:00
89380524e8 Vendoring in libnetwork 22dc04d06067b40a9e7ef575aee6d1bb69d4dcc3
Notable changes include :
- #285 : Fix required for https://github.com/docker/docker/pull/12927
- #283 : Code re-architecture/tech-debt in bridge driver
- Upgraded to latest Netlink library
- Fixed certain race-conditions

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 703e2264bae99784496794365ea72348715e7c70
Component: engine
2015-08-14 05:57:47 -07:00
84c4707817 Windows: new hcsshim stdin/out/err handling
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ec5a73d18eb6a5241cdaa0b5d473abb085d6f491
Component: engine
2015-08-13 13:09:42 -07:00
c0287afaeb minor cosmetic change to client output on pull
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 8bd632276069d7057406aa6ea151296cf5bbbd2f
Component: engine
2015-08-10 21:54:03 -07:00
3c26a4792f Update vendored go-ansiterm for Windows console
This update fixes Windows client console bugs and increases VT100
compatibility. With this change, nano and emacs become usable, and bash
works better.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: ecf528fcb6d236eae9b1e187152c774393c199fe
Component: engine
2015-08-06 20:48:02 -07:00
658ec62413 Vendoring libnetwork bd3eecc96f3c05a4acef1bedcf74397bc6850d22
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: e35a5ae463507debc25fc372622cf7b0b27b6d36
Component: engine
2015-08-06 14:23:25 -07:00
d8e23349e8 Vendor coreos/go-systemd/daemon
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 61c9f4db4140be5abdc0e3dc0d2284420a8c6c28
Component: engine
2015-08-06 14:34:40 +02:00
772d6ad7e5 Update runc to v0.0.3
This fixes criu behavior with mounted cgroups.
It includes also update of go-systemd dependecy.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: a4ddf0e3624c9e05172d1ad7841f87720a4c9c87
Component: engine
2015-08-04 10:47:59 -07:00
3e038be591 Fix preallocated bridge networks
- Because of a bug, all the statically preallocated
  bridge networks have /24 as network mask.

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: dab0447ae0c6d1355cf4708743973121cd55462a
Component: engine
2015-08-03 16:37:01 -07:00
331aa42849 Fix vendoring for fluent-logger-golang
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: ef7bb7242f1155f7c87912d154a0493a36f23bb0
Component: engine
2015-08-03 10:23:50 -07:00
cb79d90bc2 Vendor latest notary
Use updated notary to pick up updates from security review

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: d594c6fcd8fbe295a87cfc2af70456be4e58c24d
Component: engine
2015-07-31 17:32:35 -07:00
da82af9892 Merge pull request #15185 from aboch/vnd_lbn_1.8
Vendoring libnetwork 31139cdb513aea5ad1ed08b60d4350a68b4c96db
Upstream-commit: 9e9f3aa36b5286556c8f99557d8bcc66946598d3
Component: engine
2015-07-31 08:58:41 -07:00
b6aee824ae Add missing LICENSE files for docker/notary
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 084af30f39ce4f00d2e3c379b8c5cc4f4d345ee0
Component: engine
2015-07-30 21:19:18 -04:00
36d21e417b Vendor docker/distribution to 7dc8d4a26b689bd4892f2f2322dbce0b7119d686
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 0cce1fb37ffbcb209826fdc98c3148fc5b1e2abd
Component: engine
2015-07-30 21:14:39 -04:00
3f5b1423ad Vendoring libnetwork 31139cdb513aea5ad1ed08b60d4350a68b4c96db
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 91274625ba43b5d059ac239bd3ca53006158b7a7
Component: engine
2015-07-30 17:28:40 -07:00
809c751de2 Merge pull request #14838 from Microsoft/10662-ansirewrite
Windows: CLI Improvement (TP3)
Upstream-commit: 33358f80e592686bb1872d9d50a4dd1e0391487f
Component: engine
2015-07-27 17:30:14 -07:00
fd4a984052 Update vendored distribution repo to new version
This version includes a fix that avoids checking against specific HTTP
status codes. The previous behavior violated the registry API spec.

Fixes #14975

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 091dbc103434eafa22afaed374032c8b3ecb8001
Component: engine
2015-07-27 09:37:38 -07:00
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
8d26f588ee Keep license files
Currently the vendor script removes directories which do not have imported go packages, however this also ends up removing license files which may be other directories.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 82685367d8d5087b16a583123f45fdcb1c7c64dc
Component: engine
2015-07-23 16:12:21 -07:00
3221713ea7 Fix pruning on tar split
Currently the vendor script prunes files which are currently checked in.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: a8546df89d1670c0f0edc9dab78cef611b42e929
Component: engine
2015-07-23 15:21:32 -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
3a0a990d94 Merge pull request #14067 from vbatts/vbatts-tar-split
graph: layer tar disassembly and reassembly
Upstream-commit: 1639288b0a686f30f4c73486590b1c93d61b9f28
Component: engine
2015-07-22 12:53:26 -07:00
051476e67d vendor: adding tar-split dependency for graph
tar-split is a facility to disassemble and reassemble tar archives

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 7fb061832a0ebf197abb41c576887a1d2aca18be
Component: engine
2015-07-22 11:36:10 -04:00
364910e844 Windows: CLI Improvement
The Ansi parser and their associated actions have been decoupled. Now
parsing results in call backs to an interface which performs the
appropriate actions depending on the environment.

This improvement provides a functional Vi experience and the vttest no
longer panics.

This PR replaces docker/docker #13224 with the latest console updates.

Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: c923774c41678e4044081a87ec5841173d9577e7
Component: engine
2015-07-21 16:38:44 -07:00
f8dc4be64b Windows: Statically linkable SQLite3
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 10bcaca914b32af29d8ce9974c5f5656a2f8cc1d
Component: engine
2015-07-21 09:33:46 -07:00
d9c672b3bd Update libcontainer to v0.0.2
This is fix for proper setup of nested containers cgroups.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: f0f261a899acf3c11d01c97e2503ec0ddb200232
Component: engine
2015-07-17 15:05:17 -07:00
8a425b30fb Merge pull request #14693 from LK4D4/update_libcontainer
Update libcontainer
Upstream-commit: 98ed9a55f42f7c86c7c9cddb27f6807e7e77c889
Component: engine
2015-07-17 13:02:04 -07: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
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
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
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
c3450bd95b Windows: Exec driver
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 9ae9d4c87af8b04eb80006aca9f760ffdb1052bb
Component: engine
2015-07-10 13:36:56 -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
22652d4dad Add new logging driver: fluentd
Signed-off-by: TAGOMORI Satoshi <tagomoris@gmail.com>
Upstream-commit: 361a582ba0bccea04a8ea1799e68779fa66abb9f
Component: engine
2015-06-26 11:03:11 +09: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