Commit Graph

418 Commits

Author SHA1 Message Date
345460db06 Vendor engine-api 0.3.1.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 58385bc8a51e538f64a0d91c3259f20c6c289c86
Component: engine
2016-03-23 15:05:19 -04:00
ce07920e99 Add docker- prefix to runc and containerd binaries
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 009399dc8ed8a4b635b0e229bf07b685e286d8d9
Component: engine
2016-03-23 00:52:16 -04:00
0ff9a3fc56 Merge pull request #21396 from aboch/vnn
Vendoring libnetwork v0.7.0-dev.10
Upstream-commit: 506fb9810c60177b360b9dabab516828b90ffc48
Component: engine
2016-03-22 15:09:42 -07:00
2e2ed4c31e Merge pull request #21303 from riyazdf/notary-vendor-docker1.11
vendor notary for docker1.11
Upstream-commit: 8b8fcb796f85bc8f5146fa61ce667699f0436591
Component: engine
2016-03-22 17:57:17 -04:00
26e4c9db49 Vendoring libnetwork v0.7.0-dev.10
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: fbdb3c3a4b15720c0df3a59d4bef0773b365c2b1
Component: engine
2016-03-22 12:36:21 -07:00
02220a45c4 Merge pull request #21270 from ehazlett/resource-labels
Add Label support for Images (build), Networks and Volumes on Creation
Upstream-commit: 53d2e5e9d754ce8fbef733759e9ec450514133e3
Component: engine
2016-03-22 15:12:33 -04:00
20a8382c82 vendor notary for docker1.11
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: ab3772f72fcb189c742510326069474ea625042f
Component: engine
2016-03-22 11:28:19 -07:00
fe56b4ef22 add label support for build, networks and volumes
build: implement --label

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

network: allow adding labels on create

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

volume: allow adding labels on create

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

add tests for build, network, volume

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

vendor: libnetwork and engine-api bump

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: fc214b4408d915e3510f61c7584ca01c176d1373
Component: engine
2016-03-22 11:49:06 -04:00
f1f7a4b7fc Merge pull request #19439 from pcarrier/pcarrier/19438-async-connections-to-fluentd
fluentd logger: support all options besides Unix sockets
Upstream-commit: d82ad12df813824d9166478068536d7d78cf0b69
Component: engine
2016-03-21 18:09:14 +01:00
78405a5d4a Merge pull request #21283 from runcom/update-test
vendor docker/distribution d06d6d3b093302c02a93153ac7b06ebc0ffd1793
Upstream-commit: a05fdd680662d36c6d79add46b07ad5dcee7f6d7
Component: engine
2016-03-21 09:46:28 -07:00
50eb81fd53 Merge pull request #21342 from tonistiigi/cleanup-libcontainer
Convert libnetwork stats directly to api types 
Upstream-commit: 2a4c970aeb23cace02963eb364474e6197388170
Component: engine
2016-03-21 08:54:03 -07:00
b2b2246770 Update vendored engine-api for OpenBSD support
Signed-off-by: Frank Groeneveld <frank@frankgroeneveld.nl>
Upstream-commit: 3cf8a9ede71081efbade168fa6ff6d65d2a0e4eb
Component: engine
2016-03-21 12:11:11 +01:00
0d8ebbb32a bump fluent-logger-golang version
This version supports async connections.

Signed-off-by: Pierre Carrier <pierre@meteor.com>
Upstream-commit: 9c2a0739fb9c5e3636425d669f0ab860ea1bfbae
Component: engine
2016-03-20 16:22:21 +00:00
b86b204077 Remove unused libcontainer vendoring
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: f25d9f0f236db5b3d8671c4e25016ca5a0f8535d
Component: engine
2016-03-19 13:04:37 -07:00
2aaa69712c vendor docker/distribution d06d6d3b093302c02a93153ac7b06ebc0ffd1793
- fix and add integration tests

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: c48439af7f33fccc17013ae7f9e64d4c107502f1
Component: engine
2016-03-19 12:19:48 +01:00
efaac80fee Vendor containerd, specs, runc
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: cc83031ade5c4baed722c31603d56d54e4679681
Component: engine
2016-03-18 13:38:26 -07:00
5d6926e18b Vendor updated grpc, protobuf
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 14299daacaf4e80735615ff9f42ba2479cf04486
Component: engine
2016-03-18 13:38:21 -07:00
10d4438fda Windows: revendor Microsoft/hcsshim to v0.1.0
This (the first tagged hcsshim release) fixes long-path bugs on
Windows TP5 that affect commit and save. These bugs were blocking
commit of Windows containers that had node.js installed.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: b54058bafe07718a02e81a19b2dfc779dcdf11ba
Component: engine
2016-03-17 21:08:07 +00:00
94bf0c258a Remove vagrant files from vendor
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 46da04388f144579a638aeb09ec5c10c800120d0
Component: engine
2016-03-16 20:30:47 -07:00
920cce78bf Merge pull request #21261 from aboch/vnd
Vendoring libnetwork v0.7.0-dev.8
Upstream-commit: 4227119588297a0ac36a4f5fe4ac9457e04b6918
Component: engine
2016-03-16 18:56:49 -07:00
d0536df380 Vendoring libnetwork v0.7.0-dev.8
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 62232919650438a6ae2b18714b4fe223d34277f5
Component: engine
2016-03-16 13:45:34 -07:00
c7abc234c4 Vendor engine-api to fba5dc8
It plumbs net/context.Context through entire API, see docker/engine-api#140

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 48339017dbb7a09827445d8c1a9db9ae6ecb8a4a
Component: engine
2016-03-16 20:25:09 +01:00
be26fc7c6f Windows: revendor go-winio with npipe fixes
This revendor provides support for CloseWrite() in the npipe transport,
fixes a performance regression introduced in Go 1.6, and improves
npipe performance by allowing the pipe buffer size to be specified.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 87c2aad6f11c4993222dd29fb8c7c520b19ac8d9
Component: engine
2016-03-15 18:25:34 -07:00
a516bc2aa3 Merge pull request #19831 from cloudflare/optimize-gelf
GELF logger: Add gelf-compression-type and gelf-compression-level
Upstream-commit: 0f59b0b12c37b5a3b4ad1c8a0cb91c93ff4228a9
Component: engine
2016-03-15 22:35:46 +01:00
971cc9c13a Merge pull request #20121 from solganik/master
syslog format
Upstream-commit: f5009515989f6e16d3e9955a7905d1fe64e73642
Component: engine
2016-03-14 20:09:15 -04:00
83045d547d Merge pull request #20970 from dmcgowan/login-oauth
OAuth support for registries
Upstream-commit: b9361f02da25108af75238093959634e433d72a0
Component: engine
2016-03-14 15:49:44 +01:00
3d62a1d04d Merge pull request #21122 from mavenugo/mviv
Vendor libnetwork v0.7.0-dev.7 : Experimental MacVlan and IPVlan network drivers
Upstream-commit: 2d74f78ab59c4e24c5f328f3d85671359b8ed828
Component: engine
2016-03-13 11:32:58 -07:00
f943c3b499 Vendor libnetwork v0.7.0-dev.7
* Experimental support for macvlan and ipvlan drivers

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 9047cd40c2b2eb0609132800b9b8752d1cad0fcc
Component: engine
2016-03-11 14:22:25 -08:00
4f99aa8f32 Use forked gocheck and vendor
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: e6e0837cbbebca0736f27b473ffa14c991c77787
Component: engine
2016-03-11 14:38:50 -05:00
456f39ab85 upgrade go-gelf vendor
Signed-off-by: Daniel Dao <dqminh@cloudflare.com>
Upstream-commit: ae6ee5e4af2e57bdcf5ee3a1e6155ba3cf58cb98
Component: engine
2016-03-11 15:18:58 +00:00
6152b50e42 Merge pull request #20983 from Microsoft/jstarks/fix_save_powershell_remoting
Windows: Revendor github.com/Microsoft/go-winio
Upstream-commit: 9ff74391620c65661d2d543598fe96efb37f08fc
Component: engine
2016-03-10 08:28:36 -08:00
f60019e64d Merge pull request #21019 from aboch/se
Add port configs to Sandbox and libnetwork vendoring
Upstream-commit: d99be399c35df921970bb8bebf4b4bdf774849b3
Component: engine
2016-03-09 22:27:37 -05:00
f9df9657b6 Vendor updates to distribution
Pull in changes for refresh token in the registry client

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 5730259f324a59a6dddf63a950ab8eb9cde3ca0c
Component: engine
2016-03-09 13:47:57 -08:00
49e4bdf8ec Fixes #18712: Vendoring srslog to latest version.
In order to solve the issue metioned in  https://github.com/docker/docker/issues/18712
it is required to use rfc5424 log formatted message, made available in latest srslog library.

Signed-off-by: Solganik Alexander <solganik@gmail.com>
Upstream-commit: f988741823c1c510e97f2508d6a5bed68f65440a
Component: engine
2016-03-09 22:28:51 +02:00
2793bc287f Vendor docker/engine-api
Vendor docker/engine-api 9bab0d5b73872e53dfadfa055dcc519e57b09439

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: f446771f0b20330523d014656427a95000540735
Component: engine
2016-03-09 15:52:44 +08:00
d91c7046be Vendoring libnetwork v0.7.0-dev.5
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 5a654089416762da484ca9929fcd216076b591ab
Component: engine
2016-03-08 18:47:02 -08:00
6edddb55ea Windows: Revendor github.com/Microsoft/go-winio
This fixes docker save when the daemon was launched from a remote
PowerShell session.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 845dce846528f1ab7f6dc43b760b32aee666d9ac
Component: engine
2016-03-08 12:27:48 -08:00
a7b2a00b04 Windows: Revendor github.com/Microsoft/hcsshim
This fixes commit on Windows post-TP4 due to a small change
in behavior in the ExportLayer API.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 53b8b8f0581b4ecb04a2aa4a195fd805f81bfa8c
Component: engine
2016-03-05 19:10:32 -08:00
ccf28f0895 Update engine-api vendor for UsernsMode
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: ee2183881b0273ff1707501e71798a61018f50f0
Component: engine
2016-03-03 09:11:38 -05:00
4dd14aa176 Merge pull request #20863 from thaJeztah/add-kernel-memory-warning
Add KernelMemory to "info" and show warning
Upstream-commit: 15e68dc8eefad6b5b125209438a04d1d443e5b26
Component: engine
2016-03-03 13:14:51 +01:00
209e95dee8 Write Windows layer diffs to tar in standard format
Previously, Windows layer diffs were written using a Windows-internal
format based on the BackupRead/BackupWrite Win32 APIs. This caused
problems with tar-split and tarsum and led to performance problems
in implementing methods such as DiffPath. It also was just an
unnecessary differentiation point between Windows and Linux.

With this change, Windows layer diffs look much more like their
Linux counterparts. They use AUFS-style whiteout files for files
that have been removed, and they encode all metadata directly in
the tar file.

This change only affects Windows post-TP4, since changes to the Windows
container storage APIs were necessary to make this possible.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 5649030e25bd87b4b0bbd200515b8c7317ae8ce1
Component: engine
2016-03-02 16:13:40 -08:00
d823347712 Vendor engine-api
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: dd850530a96baef9f109fd2292f8c51a0836eefc
Component: engine
2016-03-02 23:32:25 +01:00
038a7f9bf3 Revendor Microsoft/go-winio and Microsoft/hcsshim
Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 882edc3f0e92483ccf9b7d4b32c5a63f73e12bbe
Component: engine
2016-03-02 14:17:13 -08:00
79fb33ace9 Merge pull request #18766 from mikedanese/gcplogs
Add logging driver for Google Cloud Logging
Upstream-commit: 3c4d093babb6f4f4f8343f5c364c5229a9d96ba3
Component: engine
2016-03-02 02:09:44 +01:00
98394b0b6e Vendor engine-api to 70d266e96080e3c3d63c55a4d8659e00ac1f7e6c
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 53b0d62683ee798198c553353dc2106623a9259b
Component: engine
2016-02-29 19:28:37 +08:00
2099e9bf10 bumping miekg/pkcs11 dependency for go1.6
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 0bb1acee3778009d775b81525f64796d9ea62a21
Component: engine
2016-02-25 21:29:37 -08:00
534b2f0779 Vendor in notary v0.2.0
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 84dc2d9e70f1ad4422732421e2d6b91274f4dfae
Component: engine
2016-02-25 13:40:00 -08:00
a53aa6e576 vendor: add dependencies of gcplogs driver
The added dependencies are:
* golang.org/x/oauth2
* google.golang.org/api
* google.golang.org/cloud

Signed-off-by: Mike Danese <mikedanese@google.com>
Upstream-commit: 123f22004bf30006be9a00be99da09b4cdf5134b
Component: engine
2016-02-24 10:42:32 -08:00
19b1f464fe Revert "vendor: remove fsnotify"
This reverts commit bc195e1558d3091dccb209f1bb35115248886c7a.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: d3bffa1639655b9d0f96b8ef4b1842663e7d2741
Component: engine
2016-02-23 21:43:27 -05:00
ee3aee350a Update libcontainer to 2c3115481ee1782ad687a9e0b4834f89533c2acf
It includes fix for parsing systemd cgroup names

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 4fc5bd295eedbefe1b429d98be52f794f1461f2f
Component: engine
2016-02-23 13:37:20 -08:00