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

1430 commits

Author SHA1 Message Date
Tonis Tiigi
ea799625bd Fix symlink copying for deb init scripts 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 61277c395b)
 2016-03-25 13:43:08 -04:00
cyli
3ef31215f4 Revert "Merge pull request #21003 from riyazdf/hardware-signing-ga" 
This reverts commit e6d3a9849c, reversing
changes made to d3afe34b51.

Signed-off-by: cyli <cyli@twistedmatrix.com>
(cherry picked from commit dd33d18045)
 2016-03-25 13:43:08 -04:00
Ken Cochrane
48ce060e8c Packaging changes required for new containerd binaries 
These are the changes required due to the new binaries that containerd introduced.
The rpm, and deb packages now include 5 binaries.

docker, containerd, containerd-shim, ctr, and runc

The tar files also include all 5 binaries.

Signed-off-by: Ken Cochrane <KenCochrane@gmail.com>
(cherry picked from commit bb66d7144f)
 2016-03-25 13:43:07 -04:00
David Calavera
8c390f0987 Vendor engine-api 0.3.1. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
(cherry picked from commit 58385bc8a5)
 2016-03-25 13:43:06 -04:00
Tibor Vass
dd51e85c05 Fix release.sh script 
Use aws instead of s3cmd.
Make sure the release script works with the docker-prepended binary
names.

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-03-23 11:59:21 -04:00
Tibor Vass
009399dc8e Add docker- prefix to runc and containerd binaries 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-03-23 00:52:16 -04:00
Tibor Vass
d0d17a0693 Merge pull request #21397 from kencochrane/update-release-script 
Updated release.sh script to stop uploading binaries
 2016-03-22 20:29:16 -04:00
David Calavera
d02d48b4b1 Merge pull request #21402 from crosbymichael/tar-binaries 
Add containerd and runc binaries to tgz output
 2016-03-22 17:11:34 -07:00
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