Commit Graph

1400 Commits

Author SHA1 Message Date
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
1071163f90 Merge pull request #21003 from riyazdf/hardware-signing-ga
Move hardware signing out of experimental
Upstream-commit: e6d3a9849c96201681915944947a0e5452619929
Component: engine
2016-03-17 14:16:40 -04: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
4686c0e8ba Clean Vagrantfile from vendoring
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 02476b23a796bfc2c51413a62cfc6329d5fa88cb
Component: engine
2016-03-16 20:25:04 +01:00
8ab562c891 Improve messaging and binary generation for pkcs11
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: f7fa83c9101a015e03af86746f4c9de90d4146e3
Component: engine
2016-03-16 09:43:06 -07:00
7167a81e8a Merge pull request #21235 from Microsoft/jstarks/add_npipe_close_write
Windows: fix various npipe bugs
Upstream-commit: 3221c7a3c6367c3223c0e1b82b3de7adbbca8651
Component: engine
2016-03-16 08:23:39 -07: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
9be1d1ff78 Merge pull request #21108 from tianon/detect-daemon-osarch
Adjust "hack/make/.detect-daemon-osarch" to be the source of truth for "platform detection"
Upstream-commit: 133b3cccb50dadf2b8b10519e3c8d8b924a91b76
Component: engine
2016-03-15 17:00:55 -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
4a5c3e02cf Merge pull request #21226 from calavera/fix_experimental_deb_builds
Move debian rules to the right place before creating the package.
Upstream-commit: 6c2f4381d30780f27f7a6abe9fc344cbbf68e179
Component: engine
2016-03-15 13:37:20 -07:00
2c866ad3a3 Move debian rules to the right place before creating the package.
debhelper has changed the way it performs path validations and
building the deb package fails when it tries to compress the files.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 027f4fdca678ae955db6f115d6af15d532f6cf4b
Component: engine
2016-03-15 16:17:38 -04:00
971cc9c13a Merge pull request #20121 from solganik/master
syslog format
Upstream-commit: f5009515989f6e16d3e9955a7905d1fe64e73642
Component: engine
2016-03-14 20:09:15 -04:00
937fbaecf3 Merge pull request #21131 from estesp/gcc-devmapper-test-broken
Fix gcc compile test with proper flag ordering
Upstream-commit: 3771a1713bac935721ffe2ed7c828a47dbe4924e
Component: engine
2016-03-14 09:46:49 -07:00
a49d2649c3 Add explicit code to handle older versions of Docker, too
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: e84a303543e19157372dbf31853e29a9c1257491
Component: engine
2016-03-14 09:30:45 -07: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
e515f9e88b Fix gcc compile test with proper flag ordering
This test for libdevmapper was always silently failing because the
linker never got the `-ldevmapper` information. Putting the flag last
corrects the test.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: e2076453071f9fc82478557919d327c958eec712
Component: engine
2016-03-11 15:08:58 -05:00
86b3710469 use per-check timeouts
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 11d3f7092e38e1e90d926595c5a4ab9ff0da535c
Component: engine
2016-03-11 14:38:52 -05: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
7a73dfa3a8 Adjust "hack/make/.detect-daemon-osarch" to be the source of truth for "platform detection"
Instead of being split between three files, let's let `hack/make/.detect-daemon-osarch` be our single source of truth for multiarch detection/vars.  Not only does it make it slightly easier to make sure we change everything properly when these bits have to change, but it also makes it so that all bits of `hack/make.sh` (especially `hack/make/.ensure-frozen-images`) work properly outside the context of the `Makefile` on all platforms.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: a667cd88c3dc9262f4ef4e2a317c10f6cdcdf5ae
Component: engine
2016-03-10 20:07:21 -08:00
a1a5012791 Merge pull request #21098 from kencochrane/fix_vendoring_script_macosx
Fix the vendoring script on MacOS X
Upstream-commit: 9ad946eded6fb05ddc331bd565473ea68b83bdd9
Component: engine
2016-03-10 22:45:55 -05:00
f1c35029ca Put back the hack that was originally in place.
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
Upstream-commit: 94445b2fea906df1bedec40284591d752def18e2
Component: engine
2016-03-10 20:27:44 -05:00
7b9d944eb3 Fix the vendoring script on MacOS X
The version of sed on MacOS X is different then the one on linux. The mac version
requires a parameter for the inline (-i) flag, where this isn't required on linux.
On the mac it thinks the -e flag is the parameter, and it causes the vendoring script
to fail.

This fix adds an empty string '' as a parameter to sed, which works fine on both the
mac and linux versions.

Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
Upstream-commit: 9488696814f481d2b0dce03d77657ec6860b9701
Component: engine
2016-03-10 16:43:53 -05:00
3dbccba8c4 Merge pull request #20478 from msabansal/HNSIntegration
Windows libnetwork integration
Upstream-commit: 2b8e7ad4609e668d2187e81055e1e76ed0c11552
Component: engine
2016-03-10 13:33:04 -08: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
23f9a9fa41 Windows libnetwork integration
Signed-off-by: msabansal <sabansal@microsoft.com>
Upstream-commit: e8026d8a98ef30ff0ada303404e02567caebb1b0
Component: engine
2016-03-09 20:33:21 -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
36c16b54a0 Merge pull request #21036 from jfrazelle/fix-release-generation
only add the suites that exist we dont need the script for this
Upstream-commit: 471e434400620f60e434bee4f6040783449c7e5e
Component: engine
2016-03-08 15:11:49 -05:00
3d1795a330 Merge pull request #20727 from mrunalp/no_new_priv
Add support for NoNewPrivileges in docker
Upstream-commit: dc702b6c6bda5cd2d530e86804627c1a5a155e3c
Component: engine
2016-03-08 14:26:15 -05:00
34c6a97598 only add the suites that exist we dont need the script for this
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 0ab5805c0850d055c92f29fbadd4b7a90fc4f76a
Component: engine
2016-03-08 11:08:00 -08:00
3fbcbce6e6 Update packaging for yubico
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 2c3e9e57949d23b4453b21339da56f0424ecbe42
Component: engine
2016-03-07 17:17:15 -08:00
6a7d53836d Move pkcs11 out of experimental, into GA
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 37fa75b3447007bb8ea311f02610bb383b0db77f
Component: engine
2016-03-07 10:07:40 -08:00
3e9b68d581 Add support for NoNewPrivileges in docker
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>

Add tests for no-new-privileges

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>

Update documentation for no-new-privileges

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Upstream-commit: 74bb1ce9e9dbfa9dd866e84f891e865fca906d9a
Component: engine
2016-03-07 09:47:02 -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
d4eaa45a84 Windows CI: Bump timeout for tests
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 6a1ae187d081a5023493ab20fe41ba8a768d62bf
Component: engine
2016-03-04 09:36:46 -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
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
307185d18b Merge pull request #20617 from nalind/journald-pkgconfig
Try to handle changing names for journal packages
Upstream-commit: 36401f20ceb8b689fb619df4f6c7219fe76b521c
Component: engine
2016-03-01 15:38:03 -05:00