beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
22974 commits 14 branches 412 tags 338 MiB
Commit graph

1389 commits

Author SHA1 Message Date
Phil Estes
133b3cccb5 Merge pull request #21108 from tianon/detect-daemon-osarch 
Adjust "hack/make/.detect-daemon-osarch" to be the source of truth for "platform detection"
 2016-03-15 17:00:55 -07:00
Antonio Murdaca
0f59b0b12c Merge pull request #19831 from cloudflare/optimize-gelf 
GELF logger: Add gelf-compression-type and gelf-compression-level
 2016-03-15 22:35:46 +01:00
Jess Frazelle
6c2f4381d3 Merge pull request #21226 from calavera/fix_experimental_deb_builds 
Move debian rules to the right place before creating the package.
 2016-03-15 13:37:20 -07:00
David Calavera
027f4fdca6 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>
 2016-03-15 16:17:38 -04:00
Brian Goff
f500951598 Merge pull request #20121 from solganik/master 
syslog format
 2016-03-14 20:09:15 -04:00
David Calavera
3771a1713b Merge pull request #21131 from estesp/gcc-devmapper-test-broken 
Fix gcc compile test with proper flag ordering
 2016-03-14 09:46:49 -07:00
Tianon Gravi
e84a303543 Add explicit code to handle older versions of Docker, too 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2016-03-14 09:30:45 -07:00
Vincent Demeester
b9361f02da Merge pull request #20970 from dmcgowan/login-oauth 
OAuth support for registries
 2016-03-14 15:49:44 +01:00
Alexander Morozov
2d74f78ab5 Merge pull request #21122 from mavenugo/mviv 
Vendor libnetwork v0.7.0-dev.7 : Experimental MacVlan and IPVlan network drivers
 2016-03-13 11:32:58 -07:00
Madhu Venugopal
9047cd40c2 Vendor libnetwork v0.7.0-dev.7 
* Experimental support for macvlan and ipvlan drivers

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-03-11 14:22:25 -08:00
Phil Estes
e207645307 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)
 2016-03-11 15:08:58 -05:00
Brian Goff
11d3f7092e use per-check timeouts 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-03-11 14:38:52 -05:00
Brian Goff
e6e0837cbb Use forked gocheck and vendor 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-03-11 14:38:50 -05:00
Daniel Dao
ae6ee5e4af upgrade go-gelf vendor 
Signed-off-by: Daniel Dao <dqminh@cloudflare.com>
 2016-03-11 15:18:58 +00:00
Tianon Gravi
a667cd88c3 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>
 2016-03-10 20:07:21 -08:00
Brian Goff
9ad946eded Merge pull request #21098 from kencochrane/fix_vendoring_script_macosx 
Fix the vendoring script on MacOS X
 2016-03-10 22:45:55 -05:00
Ken Cochrane
94445b2fea Put back the hack that was originally in place. 
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
 2016-03-10 20:27:44 -05:00
Ken Cochrane
9488696814 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>
 2016-03-10 16:43:53 -05:00
Arnaud Porterie
2b8e7ad460 Merge pull request #20478 from msabansal/HNSIntegration 
Windows libnetwork integration
 2016-03-10 13:33:04 -08:00
David Calavera
9ff7439162 Merge pull request #20983 from Microsoft/jstarks/fix_save_powershell_remoting 
Windows: Revendor github.com/Microsoft/go-winio
 2016-03-10 08:28:36 -08:00
msabansal
e8026d8a98 Windows libnetwork integration 
Signed-off-by: msabansal <sabansal@microsoft.com>
 2016-03-09 20:33:21 -08:00
Brian Goff
d99be399c3 Merge pull request #21019 from aboch/se 
Add port configs to Sandbox and libnetwork vendoring
 2016-03-09 22:27:37 -05:00
Derek McGowan
5730259f32 Vendor updates to distribution 
Pull in changes for refresh token in the registry client

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2016-03-09 13:47:57 -08:00
Solganik Alexander
f988741823 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>
 2016-03-09 22:28:51 +02:00
Zhang Wei
f446771f0b Vendor docker/engine-api 
Vendor docker/engine-api 9bab0d5b73872e53dfadfa055dcc519e57b09439

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-03-09 15:52:44 +08:00
Alessandro Boch
5a65408941 Vendoring libnetwork v0.7.0-dev.5 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-03-08 18:47:02 -08:00
John Starks
845dce8465 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>
 2016-03-08 12:27:48 -08:00
Tibor Vass
471e434400 Merge pull request #21036 from jfrazelle/fix-release-generation 
only add the suites that exist we dont need the script for this
 2016-03-08 15:11:49 -05:00
Brian Goff
dc702b6c6b Merge pull request #20727 from mrunalp/no_new_priv 
Add support for NoNewPrivileges in docker
 2016-03-08 14:26:15 -05:00
Jessica Frazelle
0ab5805c08
only add the suites that exist we dont need the script for this 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2016-03-08 11:08:00 -08:00
Mrunal Patel
74bb1ce9e9 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>
 2016-03-07 09:47:02 -08:00
John Starks
53b8b8f058 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>
 2016-03-05 19:10:32 -08:00
John Howard
6a1ae187d0 Windows CI: Bump timeout for tests 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-03-04 09:36:46 -08:00
Phil Estes
ee2183881b Update engine-api vendor for UsernsMode 
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2016-03-03 09:11:38 -05:00
Sebastiaan van Stijn
15e68dc8ee Merge pull request #20863 from thaJeztah/add-kernel-memory-warning 
Add KernelMemory to "info" and show warning
 2016-03-03 13:14:51 +01:00
Sebastiaan van Stijn
dd850530a9 Vendor engine-api 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-03-02 23:32:25 +01:00
John Starks
882edc3f0e Revendor Microsoft/go-winio and Microsoft/hcsshim 
Signed-off-by: John Starks <jostarks@microsoft.com>
 2016-03-02 14:17:13 -08:00
Sebastiaan van Stijn
3c4d093bab Merge pull request #18766 from mikedanese/gcplogs 
Add logging driver for Google Cloud Logging
 2016-03-02 02:09:44 +01:00
Tibor Vass
36401f20ce Merge pull request #20617 from nalind/journald-pkgconfig 
Try to handle changing names for journal packages
 2016-03-01 15:38:03 -05:00
Sebastiaan van Stijn
b211e57f23 Merge pull request #20774 from hqhq/hq_vender_engine_api 
Vendor engine-api to 70d266e96080e3c3d63c55a4d8659e00ac1f7e6c
 2016-02-29 18:48:55 +01:00
Qiang Huang
53b0d62683 Vendor engine-api to 70d266e96080e3c3d63c55a4d8659e00ac1f7e6c 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-02-29 19:28:37 +08:00
Mike Dougherty
adac575dd3 Use multiple keyservers in install script 
This improves on an earlier change by adding another keyserver and using a for loop instead of duplicating the command

Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
 2016-02-26 17:22:00 -08:00
Tianon Gravi
5bfaab984c Merge pull request #20636 from anusha-ragunathan/apt-ftparchive 
Always create apt-ftparchive.conf.
 2016-02-26 14:12:06 -08:00
Riyaz Faizullabhoy
0bb1acee37 bumping miekg/pkcs11 dependency for go1.6 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2016-02-25 21:29:37 -08:00
Riyaz Faizullabhoy
84dc2d9e70 Vendor in notary v0.2.0 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2016-02-25 13:40:00 -08:00
Tibor Vass
f4a1e3db99 Support TLS remote test daemon 
This will allow us to have a windows-to-linux CI, where the linux host
can be anywhere, connecting with TLS.

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-02-25 14:12:17 -05:00
Mike Danese
123f22004b 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>
 2016-02-24 10:42:32 -08:00
Brian Goff
d3bffa1639 Revert "vendor: remove fsnotify" 
This reverts commit bc195e1558.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-02-23 21:43:27 -05:00
Anusha Ragunathan
204c7808f9 Always create apt-ftparchive.conf. 
The Releases file(s) and other bits for EOL-ed distros such as Ubuntu
Vivid should remain untouched when we are releasing debs.

However, few files in https://apt.dockerproject.org/repo/dists/ubuntu-vivid/
were being updated for the docker 1.10 release including the Release files.
This is due to apt-ftparchive generating index files for vivid as well,
due to the stale apt-ftparchive.conf

This change always creates config using suites in contrib/reprepro/suites.sh.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-02-23 16:06:43 -08:00
Alexander Morozov
4fc5bd295e Update libcontainer to 2c3115481ee1782ad687a9e0b4834f89533c2acf 
It includes fix for parsing systemd cgroup names

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-02-23 13:37:20 -08:00