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

1622 commits

Author SHA1 Message Date
Sebastiaan van Stijn
28af4789e6 Merge pull request #21410 from calavera/vendor_engine_api_v0.3.0 
Vendor engine-api v0.3.0
 2016-03-22 16:41:10 -07:00
Michael Crosby
5ff66748da Export GOOS and GOARCH in subprocess for tgz 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-03-22 15:43:06 -07:00
David Calavera
9e9c73a528 Vendor engine-api v0.3.0 
I tagged the current commit so we have a better reference
of what's in this release.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-03-22 18:12:16 -04:00
David Calavera
506fb9810c Merge pull request #21396 from aboch/vnn 
Vendoring libnetwork v0.7.0-dev.10
 2016-03-22 15:09:42 -07:00
Tibor Vass
8b8fcb796f Merge pull request #21303 from riyazdf/notary-vendor-docker1.11 
vendor notary for docker1.11
 2016-03-22 17:57:17 -04:00
Alessandro Boch
fbdb3c3a4b Vendoring libnetwork v0.7.0-dev.10 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-03-22 12:36:21 -07:00
Michael Crosby
aca7e73a69 Copy containerd binaries in tgz 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-03-22 12:23:17 -07:00
Tibor Vass
53d2e5e9d7 Merge pull request #21270 from ehazlett/resource-labels 
Add Label support for Images (build), Networks and Volumes on Creation
 2016-03-22 15:12:33 -04:00
Michael Crosby
78568f2eb5 Add function for copy containerd 
This adds a function for copying containerd and other binaries as well
as adding a hash for those files.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-03-22 12:06:56 -07:00
Riyaz Faizullabhoy
ab3772f72f vendor notary for docker1.11 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2016-03-22 11:28:19 -07:00
Ken Cochrane
5e3a8ef887 Updated release.sh script to stop uploading binaries 
Signed-off-by: Ken Cochrane <KenCochrane@gmail.com>
 2016-03-22 13:42:54 -04:00
Michael Crosby
0dcdd1c5b8 Merge pull request #21341 from duglin/tweakBuild 
Add containerd/runc exes to bundle dir after build
 2016-03-22 10:29:56 -07:00
Evan Hazlett
fc214b4408 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>
 2016-03-22 11:49:06 -04:00
Doug Davis
1bf5eb20e5 Add containerd/runc exes to bundle dir after build 
Not sure if this is the right setup given the containerd change but I need
to have the built version of the nested exes (containerd, runc...) available
to me after the build is completed so I'm always testing using the latest
versions.  This PR will copy them into the same bundles dir so people can
them use them if they wish w/o having to build each separately.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2016-03-21 17:50:59 -07:00
Vincent Demeester
d82ad12df8 Merge pull request #19439 from pcarrier/pcarrier/19438-async-connections-to-fluentd 
fluentd logger: support all options besides Unix sockets
 2016-03-21 18:09:14 +01:00
Alexander Morozov
a05fdd6806 Merge pull request #21283 from runcom/update-test 
vendor docker/distribution d06d6d3b093302c02a93153ac7b06ebc0ffd1793
 2016-03-21 09:46:28 -07:00
Frank Groeneveld
3cf8a9ede7 Update vendored engine-api for OpenBSD support 
Signed-off-by: Frank Groeneveld <frank@frankgroeneveld.nl>
 2016-03-21 12:11:11 +01:00
Pierre Carrier
9c2a0739fb bump fluent-logger-golang version 
This version supports async connections.

Signed-off-by: Pierre Carrier <pierre@meteor.com>
 2016-03-20 16:22:21 +00:00
Paul Liljenberg
f10c8e786b Fix debian policy rule 
Fix issue in debian policy by removeing double quotes.

Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com>
 2016-03-19 20:58:19 +01:00
Antonio Murdaca
c48439af7f vendor docker/distribution d06d6d3b093302c02a93153ac7b06ebc0ffd1793 
- fix and add integration tests

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-03-19 12:19:48 +01:00
Tonis Tiigi
cc83031ade Vendor containerd, specs, runc 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-03-18 13:38:26 -07:00
Tonis Tiigi
14299daaca Vendor updated grpc, protobuf 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-03-18 13:38:21 -07:00
John Starks
b54058bafe 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>
 2016-03-17 21:08:07 +00:00
Tibor Vass
e6d3a9849c Merge pull request #21003 from riyazdf/hardware-signing-ga 
Move hardware signing out of experimental
 2016-03-17 14:16:40 -04:00
Tõnis Tiigi
4227119588 Merge pull request #21261 from aboch/vnd 
Vendoring libnetwork v0.7.0-dev.8
 2016-03-16 18:56:49 -07:00
Alessandro Boch
6223291965 Vendoring libnetwork v0.7.0-dev.8 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-03-16 13:45:34 -07:00
Vincent Demeester
48339017db 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>
 2016-03-16 20:25:09 +01:00
Vincent Demeester
02476b23a7 Clean Vagrantfile from vendoring 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-03-16 20:25:04 +01:00
Riyaz Faizullabhoy
f7fa83c910 Improve messaging and binary generation for pkcs11 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2016-03-16 09:43:06 -07:00
David Calavera
3221c7a3c6 Merge pull request #21235 from Microsoft/jstarks/add_npipe_close_write 
Windows: fix various npipe bugs
 2016-03-16 08:23:39 -07:00
John Starks
87c2aad6f1 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>
 2016-03-15 18:25:34 -07:00
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
Riyaz Faizullabhoy
2c3e9e5794 Update packaging for yubico 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2016-03-07 17:17:15 -08:00
Riyaz Faizullabhoy
37fa75b344 Move pkcs11 out of experimental, into GA 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2016-03-07 10:07:40 -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
Nalin Dahyabhai
6cdc4ba6cd Try to handle changing names for journal packages 
When checking if we have the development files for libsystemd's journal
APIs, check for either 'libsystemd >= 209' and 'libsystemd-journal'.  If
we find 'libsystemd', define the 'journald' tag, which defaults to using
the 'libsystemd.pc' file.  If we find the older 'libsystemd-journal',
define both the 'journald' and 'journald_compat' tags, which causes the
'libsystemd-journal.pc' file to be consulted instead.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> (github: nalind)
 2016-02-23 12:24:27 -05:00
Stefan Weil
2eee613326 Fix some typos in comments and strings 
Most of them were found and fixed by codespell.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-02-22 20:27:15 +01:00
David Calavera
64785ff146 Merge pull request #20521 from estesp/vendor-engine-api-fix 
Update engine-api vendoring to latest commit
 2016-02-19 15:41:17 -08:00
Phil Estes
1c2db56d2f Update engine-api vendoring to latest commit 
This picks up the change for `Content-Type` which will help solve issues
with authz plugins.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2016-02-19 16:20:27 -06:00
Jess Frazelle
a657cfd68b Merge pull request #20417 from redbaron/fix-deferred-removal-detection 
Fix libdevmapper deferred removal detection
 2016-02-19 13:58:18 -07:00
Jess Frazelle
3b62a610ec Merge pull request #20288 from tiborvass/debian-jessie 
Switch Dockerfile to debian:jessie ... AGAIN
 2016-02-19 13:51:30 -07:00
Arnaud Porterie
117a982d2e Merge pull request #20419 from aboch/cr 
Allow passing global datastore to libnetwork and v0.7.0-dev1 vendoring
 2016-02-18 17:39:46 -08:00
Arnaud Porterie
6a8342d63d Merge pull request #20460 from Microsoft/jjh/latestw2lciscripts 
Check in latest Win2Lin Jenkins scripts
 2016-02-18 15:58:24 -08:00
John Howard
d86f0d9b6d Check in latest Win2Lin Jenkins scripts 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-02-18 11:59:08 -08:00
Alessandro Boch
196b27211b Vendoring libnetwork v0.7.0-dev.3 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-02-17 17:07:33 -08:00
Maxim Ivanov
24152a4231 Fix libdevmapper deferred removal detection 
When linking, position of `-l` flags is important since
they muse come _after_ any object files which uses symbols
from a specified library, that is due to --as-needed binutils
ld flag enabled by default

Signed-off-by: Maxim Ivanov <ivanov.maxim@gmail.com>
 2016-02-17 23:56:21 +00:00
Alexander Morozov
929f62e64d Merge pull request #20187 from cyphar/vendor-runc 
[carry 19752] vendor: update runc/libcontainer to v0.0.8
 2016-02-17 13:59:00 -08:00
Sebastiaan van Stijn
6b70964fea Merge pull request #20375 from tiborvass/fix-yum-index-output 
Fix index generator for apt/yum packages
 2016-02-17 21:36:02 +01:00
Aleksa Sarai
093dd39686 vendor: update runc/libcontainer 
This includes all of v0.0.8 as well as a few bug fixes that popped up
during vendoring.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
 2016-02-18 01:42:36 +11:00
Aleksa Sarai
bc195e1558 vendor: remove fsnotify 
It is not longer used by us, so hack/vendor.sh complains because it
removes unused files (but also complains about removing an entire
vendored project).

Signed-off-by: Aleksa Sarai <asarai@suse.com>
 2016-02-18 00:12:53 +11:00
Phil Estes
5c78515430 Merge pull request #20366 from LK4D4/socks_proxy 
Add support for forwarding Docker client through SOCKS proxy
 2016-02-16 22:29:49 -08:00
Tibor Vass
7acd3987d3 Fix index generator for apt/yum packages 
Some @_@ characters could become visible if filename is longer than 44
characters.

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-02-16 21:54:07 -05:00
Alexander Morozov
16effc66c0 Vendor new engine-api and go-connections 
There is SOCKS5 proxy support in new versions.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-02-16 10:05:01 -08:00
Dan Walsh
443ada574d Only relabel /var/lib/docker on initial install 
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
 2016-02-16 08:27:59 -05:00
Tibor Vass
f27b5dda4a Switch Dockerfile to debian:jessie 
Fixes broken-pipe issue when piping s3cmd to grep -q, by removing the -q
flag and redirecting to /dev/null instead.

Add net-tools for ifconfig, because some tests rely on ifconfig.

Harmonize all Dockerfiles in this direction.

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-02-12 21:49:54 -05:00
Jessica Frazelle
477e1fc989
dont clean the db 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2016-02-12 13:13:50 -08:00
David Calavera
5ca6d3bafd Merge pull request #20250 from vieux/fix_misspell 
fix common misspells
 2016-02-11 17:22:06 -08:00
David Calavera
2a16099f57 Merge pull request #20241 from aaronlehmann/fallback-on-no-auth-credentials 
Fall back to V1 when there are no basic auth credentials
 2016-02-11 16:18:26 -08:00
Victor Vieux
99a396902f fix common misspell 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-02-11 15:49:36 -08:00
Jess Frazelle
2a64d400b3 Merge pull request #20114 from jfrazelle/fix-release-script 
get os arch for release script
 2016-02-11 17:28:23 -05:00
Vincent Demeester
4cdd0403cd Merge pull request #20218 from icecrime/fix_remote_integration-cli 
Improve remote integration-cli tests
 2016-02-11 22:51:20 +01:00
Aaron Lehmann
4436f07ef4 Update vendored docker/distribution 
The registry/client/auth package now provides ErrNoBasicAuthCredentials.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-02-11 10:28:18 -08:00
Brian Goff
944e4cab2e Merge pull request #20124 from calavera/fix_vendor_codec_cleanup 
Do not purge github.com/ugorji/go/codec from vendor.
 2016-02-11 12:51:35 -05:00
Phil Estes
6672d7de20 Merge pull request #20214 from mavenugo/vin0.7.0-dev.1 
Vendor libnetwork v0.7.0-dev.2
 2016-02-11 12:12:58 -05:00
David Calavera
d11a2c758a Do not purge github.com/ugorji/go/codec from vendor. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-02-11 11:22:55 -05:00
Brian Goff
acd8baccff Merge pull request #20209 from aaronlehmann/upper-case-hostnames 
Allow uppercase characters in image reference hostname
 2016-02-11 10:50:05 -05:00
Arnaud Porterie
a943c40150 Improve remote integration-cli tests 
Progress toward being able to run integration-cli campaign using a
client hitting a remote host.

Most of these fixes imply flagging tests that assume they are running on
the same host than the Daemon. Also fixes the `contrib/httpserver` image
that couldn't run because of a dynamically linked Go binary inside the
busybox image.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2016-02-11 07:31:49 -08:00
Madhu Venugopal
b2e609176d Vendor libnetwork v0.7.0-dev.2 
- Expose EnableIPV6 option
- discoverapi refactoring
- Fixed a few typos & docs update
- Fixes https://github.com/docker/docker/issues/20140

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-02-11 07:09:53 -08:00
Vincent Demeester
9ee8f0ad9d Update shakers vendoring to include the LICENSE 😇 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-02-11 08:38:09 +01:00
Arnaud Porterie
e2a0618fb1 Merge pull request #20184 from fkautz/pr_out_adding_backup_key_server_in_install_script 
Adding backup key server in install script
 2016-02-10 19:08:49 -08:00
David Calavera
dfebb6074f Merge pull request #20210 from Microsoft/jjh/hcswin32-v2 
Windows: Revendor HCS to use revised error scheme
 2016-02-10 17:20:14 -08:00
John Howard
fadbbd335c Windows: Revendor HCSShim@43858ef3 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-02-10 14:14:45 -08:00
Aaron Lehmann
e2afab9c4a Allow uppercase characters in image reference hostname 
This PR makes restores the pre-Docker 1.10 behavior of allowing
uppercase characters in registry hostnames.

Note that this only applies to hostnames, not remote image names.
Previous versions also prohibited uppercase letters after the hostname,
but Docker 1.10 extended this to the hostname itself.

- Vendor updated docker/distribution.

- Add a check to "normalize" that rejects remote names with uppercase
  letters.

- Add test cases to TestTagValidPrefixedRepo and
  TestTagInvalidUnprefixedRepo

Fixes: #20056

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-02-10 14:03:41 -08:00
John Howard
dfdce6e35c Revendor engine-api @ ddfd776c 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-02-10 13:26:35 -08:00
Frederick F. Kautz IV
5e0b8b99d1 Adding backup key server in install script 
Signed-off-by: Frederick F. Kautz IV <fkautz@redhat.com>
 2016-02-09 23:26:45 -08:00
Madhu Venugopal
84705f15d9 Vendor libnetwork v0.6.1-rc2 
- Fixes #20132 #20140 #20019

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-02-09 21:46:50 -08:00
Brian Goff
fa860c86ff Merge pull request #20158 from cpuguy83/carry_19504 
Dockerfile,contrib,hack: remove buildpack-deps
 2016-02-09 14:58:37 -05:00
Brian Goff
7c9e9afeb7 use debian:jessie for ensure-syscall-test 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-02-09 13:13:38 -05:00
David Calavera
3846951fce Merge pull request #20106 from jfrazelle/go-generate-json-default-profile 
add default seccomp profile as json
 2016-02-08 14:48:34 -08:00
Jessica Frazelle
9bc771af9d
add validation for generating default secccomp profile 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2016-02-08 13:04:52 -08:00
Jessica Frazelle
26da52d4a5
get os arch for release script 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2016-02-08 10:57:04 -08:00
Madhu Venugopal
2da61086ea Vendor libnetwork v0.6.1-rc1 
- Fixes #20026. Programming iptables in container use native API.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-02-05 18:20:22 -08:00
David Calavera
f7f1730316 Merge pull request #20038 from doertedev/master 
Grep for installed AND held packages.
 2016-02-05 13:31:30 -08:00
Alexander Morozov
9f0095f14a Merge pull request #19887 from aaronlehmann/vendor-resumable-downloads 
Vendor updated distribution for resumable downloads
 2016-02-05 12:58:53 -08:00
Stefan Staudenmeyer
b3d66ff010 Use grep -qE instead of egrep which is deprecated. 
Signed-off-by: Stefan Staudenmeyer <doerte@instana.com>
 2016-02-05 18:55:39 +01:00
Stefan Staudenmeyer
996ca75413 Grep for installed AND held packages. 
Signed-off-by: Stefan Staudenmeyer <doerte@instana.com>
 2016-02-05 17:41:57 +01:00
Aaron Lehmann
4d437a29d2 Vendor updated distribution for resumable downloads 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-02-04 17:33:37 -08:00
Tibor Vass
da58ee42bb Merge pull request #19984 from calavera/vendor_engine_api_master 
Vendor engine-api with client context changes.
 2016-02-04 16:20:06 -05:00
David Calavera
d8355ead9e Vendor engine-api, go-connections and go-winio. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-02-04 13:59:57 -05:00
unclejack
49a45d80f2 Dockerfile,contrib,hack: remove buildpack-deps 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2016-02-04 20:22:34 +02:00
Paul Liljenberg
620b8250e8 improve test-deb-install 
This PR adds support for using the DOCKER_BUILD_PKGS env var to
better help defining what packege to build. It also adds support
for the integration-daemon so we can run it as a bundle.

Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com>

add directory test

Adds missing directory test. This helps verifying that
DOCKER_BUILD_PKGS is a directory and exists before continueing.

Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com>

fix indent

Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com>
 2016-02-04 18:14:08 +01:00
Jess Frazelle
e74c07b947 Merge pull request #19980 from tonistiigi/fix-microsoft-vendor-dir 
Remove case sensitive duplicate dir in vendor
 2016-02-03 17:32:14 -08:00
Alexander Morozov
57025bd588 Merge pull request #19972 from jfrazelle/fix-opensuse 
fix opensuse rpm
 2016-02-03 13:19:51 -08:00
Tonis Tiigi
b9a395c85d Remove case sensitive duplicate dir in vendor 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-02-03 13:06:32 -08:00
Jessica Frazelle
1cbd772629
fix opensuse rpm 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2016-02-03 10:34:17 -08:00
Amit Krishnan
408092e56b bump logrus to v0.9.0 
Signed-off-by: Amit Krishnan <amit.krishnan@oracle.com>
 2016-02-02 17:53:51 -08:00
Brian Goff
a39ad952ec Merge pull request #19889 from Microsoft/jjh/reliabilitytake2 
Windows CI: TP4 reliability hack
 2016-02-01 22:30:51 -05:00
Brian Goff
a034ac66eb Merge pull request #19902 from Microsoft/jstarks/revendor_hcsshim_fix_docker_crash 
Revendor Microsoft/hcsshim and vendor Microsoft/go-winio
 2016-02-01 22:30:08 -05:00
John Howard
2ebcb48cf1 Windows CI: TP4 reliability hack 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-02-01 18:02:57 -08:00
John Starks
7ccc0e2101 Revendor Microsoft/hcsshim and vendor Microsoft/go-winio 
This update changes the way hcsshim invokes Windows DLLs to avoid races
with the garbage collector. It also now uses go-winio to access the
pipes used for communication with processes running in the container;
this reduces the number of threads used by docker.exe, improving
scalability.

Signed-off-by: John Starks <jostarks@microsoft.com>
 2016-02-01 23:11:25 +00:00
Alessandro Boch
b80f761b14 Vendoring libnetwork 0.6.0-rc7 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-02-01 14:52:18 -08:00
Alessandro Boch
f943fd7d24 Vendoring libnetwork 0.6.0-rc6 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-01-30 20:03:03 -08:00
Jess Frazelle
c006c02611 Merge pull request #19735 from jfrazelle/add-repo-scripts 
add scripts to clean experimental rpms and debs
 2016-01-29 15:52:18 -08:00
Govinda Fichtner
7b31ed432e add support for building first ARM debian package 
Signed-off-by: Govinda Fichtner <govinda.fichtner@googlemail.com>
 2016-01-29 00:21:17 +01:00
Jessica Frazelle
9ca8386c57
add scripts to clean experimental rpms and debs 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2016-01-27 15:54:53 -08:00
Jess Frazelle
07312af8fa Merge pull request #19747 from cpuguy83/nogc 
Turn off GC during `make binary`
 2016-01-27 15:02:38 -08:00
Brian Goff
9672afa339 Add DOCKER_BUILD_GOGC to tweak GOGC for compile 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-01-27 13:35:26 -05:00
cyli
71a1caddf0 Include a new version of notary with less verbose INFO+ logging 
Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-01-27 09:46:26 -08:00
Jess Frazelle
c39c7e6edf Merge pull request #19760 from cyli/re-vendor-notary 
Re-vendor Notary and docker/go
 2016-01-27 09:36:26 -08:00
Brian Goff
ae14e6cc0a Merge pull request #19071 from icecrime/incremental_builds 
Enable incremental builds
 2016-01-27 11:21:01 -05:00
Arnaud Porterie
1445e4db32 Enable incremental builds 
Remove the `-a` build flag and introduce `-i` in order to reuse
previously compiled dependencies.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2016-01-26 21:24:44 -08:00
cyli
8fd2c8791d Re-vendor notary, as well as change jfrazelle/go to docker/go. 
Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-01-26 18:02:00 -08:00
Tibor Vass
3eaf878999 Merge pull request #19751 from crosbymichael/update-libcontainer-jan26 
Update libcontainer to 3d8a20bb772defc28c355534d83
 2016-01-26 16:57:49 -08:00
Sebastiaan van Stijn
4bcb6c7fc8 Merge pull request #19150 from mikedougherty/cs-108-rpm-release 
[CS-108] Adjust version string processing for RPM build
 2016-01-26 15:22:14 -08:00
Michael Crosby
7b5896702b Update libcontainer to 3d8a20bb772defc28c355534d83 
Fixes #14203

This bump fixes the issue of having the container's pipes connection
reset by peer because of using the json.Encoder and having a \n added to
the output.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-01-26 15:00:07 -08:00
Mike Dougherty
0410023367 Adjust version string processing for RPM build 
This will only trim off the last '-' separated token to be checked for
RC status. This allows including a 'cs#' token in the version string.

Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
 2016-01-26 11:49:59 -08:00
Jana Radhakrishnan
730a6d2fc2 Vendoring libnetwork v0.6.0-rc5 
- Cleanup stale overlay sandboxes

Fixes #19694

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2016-01-26 11:44:43 -08:00
Jess Frazelle
b5420be597 Merge pull request #19013 from hqhq/add_support_docker_aarch64 
Add support for build and test docker on arm64
 2016-01-26 10:33:48 -08:00
Arnaud Porterie
269a6d7d36 Merge pull request #19705 from mavenugo/18222 
Vendor libnetwork v0.6.0-rc4 & corresponding changes in engine for port-map sandobx handling.
 2016-01-26 09:16:57 -08:00
Aleksa Sarai
71c63aa72e vendor: update engine-api 
This removes all references to InitPath and InitSha1, as well as pulling
in a few other minor engine-api fixes.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
 2016-01-27 00:34:31 +11:00
Aleksa Sarai
4357ed4a73 *: purge dockerinit from source code 
dockerinit has been around for a very long time. It was originally used
as a way for us to do configuration for LXC containers once the
container had started. LXC is no longer supported, and /.dockerinit has
been dead code for quite a while. This removes all code and references
in code to dockerinit.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
 2016-01-26 23:47:02 +11:00
Madhu Venugopal
7029d9e6ad Vendor libnetwork v0.6.0-rc4 
- Add Endpoints() API to Sandbox interface
- Fixes #19677

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-25 19:51:21 -08:00
Madhu Venugopal
6ac9a2f410 Vendor libnetwork v0.6.0-rc3 
- Fixes docker/docker#19576
- Fixed embedded DNS to listen in TCP as well
- Fixed a race-condition in IPAM to choose non-overlapping subnet for concurrent requests

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-25 13:22:47 -08:00
Jessica Frazelle
0f379fab31
add trailing slash 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2016-01-25 09:01:46 -08:00
John Howard
5601fc8507 Windows CI: In container logic flaw 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-01-24 09:22:50 -08:00
Paul Liljenberg
0c7201ee73 Fixes #19614 
Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com>
 2016-01-24 10:28:18 +01:00
Sebastiaan van Stijn
6d1455e74b Merge pull request #19579 from cyphar/hotfix-vendor-libcontainer 
Hotfix vendor libcontainer
 2016-01-22 16:46:04 -08:00
Jess Frazelle
21ec6d3789 Merge pull request #19146 from mikedougherty/cs-105-download-script 
Create a bundle for the install script to support other domains
 2016-01-22 09:25:24 -08:00
Tibor Vass
a9fc4939df Merge pull request #19573 from sanimej/libn 
Vendor in libnetwork v0.6.0-rc2
 2016-01-22 12:07:40 -05:00
Tibor Vass
cba7ba25f4 Merge pull request #19488 from hypriot/enable-docker-trust-suite-on-arm 
Enable DockerTrustSuite for ARM again
 2016-01-22 11:23:19 -05:00
Aleksa Sarai
40b5eebb0b vendor: *: update libcontainer 
This fixes a security vulnerability in Docker, which can cause a DoS
under certain circumstances. This is from the hotfix branch, so the
vendored commit is actually bf899fef451956be4abd63de6d6141d9f9096a02 in
runc master.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
 2016-01-22 20:15:09 +11:00
Santhosh Manohar
02c9d48144 Vendor in libnetwork v0.6.0-rc2 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2016-01-21 20:46:28 -08:00
Mike Dougherty
51dad1185a Create a bundle for the install script to support other domains 
For the CS Engine we need to have an install script like OSS does, but
the locations are all different, as is the GPG key used. This is
accomplished here by slightly altering the script itself and adding a
simple 'sed' based bundle for make.sh.

This install script is used in to change the URLs instead of sed in
release.sh.

Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
 2016-01-21 20:42:20 -08:00
Jess Frazelle
e287bef453 Merge pull request #19316 from Microsoft/jjh/incontainererror 
Windows: In container build check
 2016-01-21 13:44:19 -08:00
Tibor Vass
3ecba7089b Merge pull request #19552 from aaronlehmann/vendor-distribution-3 
Vendor updated distribution package
 2016-01-21 16:21:59 -05:00
John Howard
4dbd612d47 Windows: In container build check 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-01-21 13:15:23 -08:00
Aaron Lehmann
921eae9d6d Vendor updated distribution package 
Another day, another revendor.

This revision of distribution is more tolerant of incorrect Content-Type
headers when fetching manifests.

Fixes #19526

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-01-21 11:01:14 -08:00
Tibor Vass
5f9375cf39 Merge pull request #19349 from jfrazelle/add-link-to-wiki 
add warning if upgrading via script to migrate
 2016-01-21 12:51:25 -05:00
Tibor Vass
7d19ca7c40 Merge pull request #19423 from jfrazelle/apparmor-no-install 
disable install of docker-engine for 1.10, try to get ready for 1.11
 2016-01-21 12:08:50 -05:00
David Calavera
8c0dd9d182 Merge pull request #19522 from aaronlehmann/vendor-distribution-2 
Vendor updated distribution
 2016-01-21 08:15:41 -08:00
Jess Frazelle
5537a92e45 Merge pull request #19377 from jfrazelle/cleanup-build-rpm-deb 
Cleanup build rpm deb
 2016-01-20 23:58:33 -08:00
Aaron Lehmann
a160dd4987 Vendor updated distribution 
The only changes are https://github.com/docker/distribution/pull/1379
and https://github.com/docker/distribution/pull/1380.

Fixes #19476

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-01-20 15:46:11 -08:00
Sebastiaan van Stijn
c21eb2a420 Merge pull request #19501 from vdemeester/remove-validate-vendor-from-default-bundles 
Remove validate-vendor from default bundles
 2016-01-20 14:29:07 -08:00
Alexander Morozov
7bddbdf360 Merge pull request #19503 from jfrazelle/update-logrus 
bump logrus
 2016-01-20 12:54:49 -08:00
David Calavera
bcf155bb7a Merge pull request #19469 from crosbymichael/libcontainer-resource-hf 
Update libcontainer to 47e3f834d73e76bc2a6a585b48d
 2016-01-20 11:31:14 -08:00
Jessica Frazelle
95695aa38c
bump logrus 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2016-01-20 09:51:09 -08:00
Vincent Demeester
e5bce74592 Remove validate-vendor from default bundles 
Because it's triggered another way :)
See https://github.com/docker/leeroy/pull/44

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-01-20 18:29:28 +01:00
Stefan Scherer
acb42c5fab Enable DockerTrustSuite for ARM again 
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
 2016-01-20 14:58:09 +01:00
Vincent Demeester
87b7ff5267 Merge pull request #19465 from mavenugo/sysd 
Vendor libnetwork v0.6.0-rc1
 2016-01-20 09:02:21 +01:00
Tibor Vass
7657e233f7 Merge pull request #19466 from aaronlehmann/vendor-distribution 
Vendor updated docker/distribution package
 2016-01-19 21:05:43 -05:00
Jessica Frazelle
0bff2515f7
add a way to only build requested pkgs 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2016-01-19 17:47:27 -08:00
Jessica Frazelle
60d44d8b80
add warning if upgrading via script to migrate 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2016-01-19 15:41:08 -08:00
Michael Crosby
5f73ab8952 Update libcontainer to 47e3f834d73e76bc2a6a585b48d 
This adds a fix for the resource struct in the cgroups type and seccomp
IsEnabled function

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-01-19 15:34:08 -08:00
Madhu Venugopal
ee3b42f385 Vendor libnetwork v0.6.0-rc1 
- Fixes docker/docker#19404
- Fixes ungraceful daemon restart issue in systemd with remote
  network plugin (https://github.com/docker/libnetwork/issues/813)

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-19 13:50:17 -08:00
Aaron Lehmann
588e27f9a5 Vendor updated docker/distribution package 
Fixes #19400

Note that this introduces an incompatibility with Docker 1.10-rc1,
because the media type used for schema1 manifests has been corrected in
the upstream distribution code. Docker 1.10-rc1 won't be able to pull
old manifests from Registry 2.3-rc0 and up, but because of this vendor
update, Docker 1.10-rc2 won't have this problem.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-01-19 13:28:51 -08:00
Christopher Jones
d12f4babdd Fix test requirement for ARM 
Correctly passes the DOCKER_ENGINE_GOARCH env var
to the testing environment

Also fixes logic for skipping a test if on ARM.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2016-01-19 15:23:46 -05:00
Vincent Demeester
011ca5f206 Merge pull request #19426 from sanimej/restart 
Vendoring miekg/dns @ 75e6e86cc601825c5dbcd4e0c209eab180997cd7
 2016-01-19 10:28:33 +01:00
Jess Frazelle
637f49b5af Merge pull request #19196 from Microsoft/jjh/tp4ci 
Windows CI: Setup for testing against Windows
 2016-01-18 15:22:08 -08:00
Jessica Frazelle
c4bc9657b9
disable install of docker-engine for 1.10, try to get ready for 1.11 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2016-01-18 13:38:29 -08:00
Stefan Scherer
4f339570cb Skip failing tests on ARM to get red/green feedback from Jenkins 
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
 2016-01-18 17:00:15 +01:00
Santhosh Manohar
bccf653082 Vendoring miekg/dns @ 75e6e86cc601825c5dbcd4e0c209eab180997cd7 
- Fixes the issue of Shutdown() not working, resulting in hung
  goroutines

Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2016-01-17 08:17:13 -08:00
Jess Frazelle
b69243e951 Merge pull request #19169 from Djelibeybi/fix-ol6-build 
Restoring the RPM build process for Oracle Linux 6
 2016-01-15 16:56:11 -08:00
Alexander Morozov
790e648c06 Merge pull request #19340 from Microsoft/jjh/rsrcfix 
Windows: Remove linkmode internal hack
 2016-01-15 14:10:56 -08:00
Phil Estes
dd104eb91d Merge pull request #19345 from tianon/fast-syscall-compile 
Switch "syscall-test" image from "debian:jessie" to "buildpack-deps:jessie" so that "gcc" is already included
 2016-01-15 16:06:14 -05:00
Qiang Huang
66d24c2b44 Add support for build and test docker on arm64 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-01-15 14:25:03 +00:00
Jess Frazelle
4c89b1f72c Merge pull request #19355 from riyazdf/notary-revendor 
notary revendor into docker
 2016-01-15 01:02:35 -08:00
Riyaz Faizullabhoy
dd7436c832 revendor notary and wrap friendlier error messages 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2016-01-14 20:35:59 -08:00
Sebastiaan van Stijn
e44364eae9 Merge pull request #18587 from calavera/daemon_configuration_file 
Allow to set daemon and server configurations in a file.
 2016-01-14 16:44:58 -08:00
Tibor Vass
94b2d56690 Merge pull request #19109 from BrianBland/crossRepositoryPush 
Cross repository push
 2016-01-14 18:50:53 -05:00
Brian Bland
6309947718 Changes cross-repository blob mounting to a blob Create option 
Also renames BlobSumService to V2MetadataService, BlobSum to
V2Metadata

Signed-off-by: Brian Bland <brian.bland@docker.com>
 2016-01-14 14:26:03 -08:00
Tianon Gravi
9b2aab3fc8 Switch "syscall-test" image from "debian:jessie" to "buildpack-deps:jessie" so that "gcc" is already included 
This results in a significant time savings during repeated builds (since we don't have to re-download gcc for every test run).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2016-01-14 13:51:30 -08:00
John Howard
6ca5a2c476 Windows: Remove linkmode internal hack 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-01-14 13:09:28 -08:00
David Calavera
db2b5e647c Merge pull request #19338 from aboch/vnd 
Vendoring libnetwork v0.5.5
 2016-01-14 13:02:20 -08:00
Jess Frazelle
7a44265129 Merge pull request #19324 from Djelibeybi/fix-selinux-rpm-changelog 
Remove the changelog auto-generation
 2016-01-14 12:47:32 -08:00
Santhosh Manohar
5347f7cd94 Vendoring libnetwork v0.5.6 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2016-01-14 10:48:48 -08:00
Alessandro Boch
4e4ba9dd3a Vendoring libnetwork v0.5.5 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-01-14 10:34:00 -08:00
David Calavera
1666707cf8 Vendor merge structure tool. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-01-14 11:58:38 -05:00
Avi Miller
b916d45132 Remove the changelog auto-generation because its hardcoded in the .spec file now. 
Signed-off-by: Avi Miller <avi.miller@oracle.com>
 2016-01-14 18:50:55 +11:00
Brian Goff
742a7d53f2 Merge pull request #19319 from calavera/fix_tls_config_for_response_hijacking 
Fix response hijacking with TLS enabled.
 2016-01-13 21:44:11 -05:00
David Calavera
7a5d897410 Vendor engine-api 0.2.2. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-01-13 20:09:47 -05:00
Avi Miller
22af8dfb14 Not having a changelog is bad RPM etiquette. 
Signed-off-by: Avi Miller <avi.miller@oracle.com>
 2016-01-14 10:34:48 +11:00
Brian Bland
7289c7218e Adds cross-repository blob pushing behavior 
Tracks source repository information for each blob in the blobsum
service, which is then used to attempt to mount blobs from another
repository when pushing instead of having to re-push blobs to the same
registry.

Signed-off-by: Brian Bland <brian.bland@docker.com>
 2016-01-13 14:26:30 -08:00
Tibor Vass
46eb470039 Merge pull request #19267 from mavenugo/vin-ln 
Vendor libnetwork v0.5.4
 2016-01-13 07:09:58 -05:00
Madhu Venugopal
537089481f Vendor libnetwork v0.5.4 
- Removed the isNodeAlive protection when user forces an endpoint delete

- Bridge driver supporting internal network option
- Backend implementation to support "force" option to network disconnect
- Fixing a regex in etchosts package to fix docker/docker#19080

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-12 20:42:30 -08:00
Jessica Frazelle
062d0b3921
read seccomp profile locally then pass to daemon 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2016-01-12 13:12:29 -08:00
David Calavera
ca60e6262b Vendor engine-api 0.2.1. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-01-12 13:19:16 -05:00
Sebastiaan van Stijn
c72be040bb Merge pull request #19187 from estesp/lets-do-this 
User namespaces: graduate from experimental
 2016-01-12 09:34:19 -08:00
Sebastiaan van Stijn
656979670c Merge pull request #18998 from calavera/syslog_tls 
Allow syslog over TCP+TLS.
 2016-01-11 17:21:38 -08:00
Tibor Vass
df40c61f8a Make Makefile work on OS X 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-01-11 18:16:56 -05:00
Arnaud Porterie
f11b6a2ab3 Merge pull request #18785 from aaronlehmann/new-manifest 
New image manifest format
 2016-01-11 12:01:46 -08:00
John Howard
a4b77dc1af Windows CI: Setup for testing against Windows 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-01-11 11:52:03 -08:00
Tibor Vass
2d5ca742eb Merge pull request #19076 from tianon/multiarch 
Refactor multi-arch support (especially for new mostly-official multi-arch official images)
 2016-01-11 13:25:55 -05:00
Arnaud Porterie
ad2966a315 Merge pull request #19138 from Microsoft/jjh/failedtodockerversion 
Windows CI: More debugging
 2016-01-10 18:11:19 -08:00
Arnaud Porterie
fe3d1f9dd7 Merge pull request #19198 from sanimej/vin 
Vendoring libnetwork
 2016-01-10 11:46:34 -08:00
Aaron Lehmann
290ba41c00 Vendor updated github.com/docker/distribution 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-01-08 17:24:20 -08:00
cyli
5719b136de Re-vendoring notary in order to deal with a canonical JSON serialization issue. 
Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-01-08 16:45:15 -08:00
Santhosh Manohar
8ccf5cffa7 Vendoring libnetwork and its dependencies.. 
- replace /etc/hosts based name resolution with embedded DNS for user
  defined networks
- overlay veth cleanup: docker/docker#18814
- check before programming ipv6 in bridge: docker/docker#19139
- diable DAD: docker/docker#18871

Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2016-01-08 14:13:21 -08:00
Tianon Gravi
335764a591 Merge pull request #19181 from coolljt0725/enable_build_syscall_test 
Make .ensure-syscall-test to use build-arg
 2016-01-08 13:43:38 -08:00
Phil Estes
557c7cb888 Move userns support out of experimental into master 
Adds the `--userns-remap` flag to the master build

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2016-01-08 15:06:22 -05:00
Arnaud Porterie
05de2aadff Merge pull request #19001 from aboch/pip 
Allow user to choose the IP address for the container
 2016-01-08 11:49:20 -08:00
Jess Frazelle
1c979f7587 Merge pull request #18887 from riyazdf/notary-delegations 
notary delegation integration into docker
 2016-01-08 10:37:55 -08:00
David Calavera
145f020122 Vendor new syslog library with TLS support. 
The syslog package in the stdlib is not maintained anymore.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-01-08 12:35:35 -05:00