summaryrefslogtreecommitdiff
path: root/hack
Commit message (Collapse)AuthorAgeFilesLines
* Improve source for containerd/runc copyMichael Crosby2016-04-131-1/+1
| | | | | | | This improves getting the source for the binaries that are compiled on the system so that they can be copied into the bundles output. Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
* runc install path changed from /usr/local/bin to /usr/local/sbinTibor Vass2016-04-132-2/+2
| | | | Signed-off-by: Tibor Vass <tibor@docker.com>
* Vendor Libnetwork v0.7.0-rc.6Santhosh Manohar2016-04-111-1/+1
| | | | | Signed-off-by: Santhosh Manohar <santhosh@docker.com> (cherry picked from commit 6dd2c3321793c3fe60abb94b88018e4b096f12c7)
* vendor: patch template init in trace pkg for performanceTonis Tiigi2016-04-111-1/+2
| | | | | | | | | Temporarily include a fork of golang/net package that includes a performance patch. Measured performance gain is ~60ms for every `docker run` command. Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> (cherry picked from commit 07fe6947a403124041dda50eb6d7f00e74f96ce7)
* Vendoring libnetwork v0.7.0-rc.4Alessandro Boch2016-04-061-1/+1
| | | | | Signed-off-by: Alessandro Boch <aboch@docker.com> (cherry picked from commit 8a957bafa58e2eed8f31722c7fcc3709ca509a29)
* Vendor Libnetwork v0.7.0-rc.3Santhosh Manohar2016-04-061-1/+1
| | | | | Signed-off-by: Santhosh Manohar <santhosh@docker.com> (cherry picked from commit 5b892819a60a0a91c168c6a2c1e22c958be143ca)
* Define readonly/mask paths in specTonis Tiigi2016-04-061-1/+1
| | | | | | | | | | This vendors in new spec/runc that supports setting readonly and masked paths in the configuration. Using this allows us to make an exception for `—-privileged`. Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> (cherry picked from commit 3f81b4935292d5daedea9de4e2db0895986115da)
* bump engine-api to v0.3.3 for 1.11.0-rc4Sebastiaan van Stijn2016-04-061-1/+1
| | | | | | | bumps engine API to v0.3.3, to include https://github.com/docker/engine-api/pull/193 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Change the windows .tgz to a .zip fileKen Cochrane2016-03-312-13/+39
| | | | | Signed-off-by: Ken Cochrane <kencochrane@gmail.com> (cherry picked from commit fda99a7e1653e045ec5901955a59ff1123016d93)
* Bring back support for DOCKER_RAMDISKTonis Tiigi2016-03-311-1/+1
| | | | | | | Fixes #21631 Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> (cherry picked from commit 8a4225cd5ad3ad56a7e896f675080c0ed38982a3)
* Vendor Libnetwork v0.7.0-rc.1Madhu Venugopal2016-03-311-1/+1
| | | | | | | | | | | - Fixes https://github.com/docker/libnetwork/issues/1051 - Fixes https://github.com/docker/libnetwork/issues/985 - Fixes https://github.com/docker/libnetwork/issues/945 - Log time taken to set sandbox key - Limit number of concurrent DNS queries Signed-off-by: Madhu Venugopal <madhu@docker.com> (cherry picked from commit 90bb5301b51ec6a6c77b910855441feef10492ff)
* Change the directory inside of tgz files.Ken Cochrane2016-03-311-5/+19
| | | | | | | | | | Currently the directory inside of the tgz files is /usr/local/bin and this is causing some confusion, and problems with people who already have stuff in those directories. This commit changes the directory to /docker to help remove the confusion. Signed-off-by: Ken Cochrane <kencochrane@gmail.com> (cherry picked from commit 7df5b32834237eac4c338f0ce1cba65b86bbe642)
* move hardware signing out of experimental, remove dependencies to ↵Riyaz Faizullabhoy2016-03-315-13/+3
| | | | | | | yubico-piv-tool Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com> (cherry picked from commit 8d18e6b30f0a33463c749079d87cad8fa9c19d52)
* Vendoring boltb/bolt v1.2.0Alessandro Boch2016-03-311-1/+1
| | | | | Signed-off-by: Alessandro Boch <aboch@docker.com> (cherry picked from commit 16bf3eede024f2efd088c6209e0042a040a9b8fb)
* Vendor engine-api v0.3.2 in release 1.11.David Calavera2016-03-301-1/+1
| | | | Signed-off-by: David Calavera <david.calavera@gmail.com>
* Merge pull request #21518 from tiborvass/cherrypicks-1.11.0-rc2Tibor Vass2016-03-2513-17/+84
|\ | | | | Cherrypicks 1.11.0 rc2
| * Fix release scriptsTibor Vass2016-03-255-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some missing dependencies in the Dockerfile: - apt-utils for apt-ftparchive.conf - bsdmainutils for our use of the column command in hack/make/generate-index-listing We also ensure that the docker daemon is started before calling release-deb or release-rpm, since .detect-daemon-osarch, which is sourced in each of them, requires the daemon to be running. This commit also gets completely rid of s3cmd and fixes references to AWS_* environment variables (changing from AWS_ACCESS_KEY to AWS_ACCESS_KEY_ID and AWS_SECRET_KEY to AWS_SECRET_ACCESS_KEY) in order to please awscli. Also AWS_DEFAULT_REGION is now important to specify, the default has been set to the region used by get.docker.com and test.docker.com. Signed-off-by: Tibor Vass <tibor@docker.com> (cherry picked from commit 996138bf8e6acde9a937755ef81459f7d7566fc9)
| * Fix symlink copying for deb init scriptsTonis Tiigi2016-03-251-1/+1
| | | | | | | | | | Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> (cherry picked from commit 61277c395bf0f9b560e684085d0a134406a7c179)
| * Revert "Merge pull request #21003 from riyazdf/hardware-signing-ga"cyli2016-03-254-5/+7
| | | | | | | | | | | | | | | | This reverts commit e6d3a9849c96201681915944947a0e5452619929, reversing changes made to d3afe34b51e7588984cc21a2f48da116645e52e3. Signed-off-by: cyli <cyli@twistedmatrix.com> (cherry picked from commit dd33d18045e50a198d3d75db8fba12f126e93937)
| * Packaging changes required for new containerd binariesKen Cochrane2016-03-255-4/+63
| | | | | | | | | | | | | | | | | | | | | | | | 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 bb66d7144f7d0a617f5985486ae36bbbaa5461ba)
| * Vendor engine-api 0.3.1.David Calavera2016-03-251-1/+1
| | | | | | | | | | Signed-off-by: David Calavera <david.calavera@gmail.com> (cherry picked from commit 58385bc8a51e538f64a0d91c3259f20c6c289c86)
* | Added a better message for when we build an unsupported versionKen Cochrane2016-03-251-0/+8
|/ | | | | Signed-off-by: Ken Cochrane <kencochrane@gmail.com> (cherry picked from commit 181d2725d7ac8da5174b1a13d3ee413057af57b8)
* Fix release.sh scriptTibor Vass2016-03-232-29/+24
| | | | | | | | 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>
* Add `docker-` prefix to runc and containerd binariesTibor Vass2016-03-232-11/+7
| | | | Signed-off-by: Tibor Vass <tibor@docker.com>
* Merge pull request #21397 from kencochrane/update-release-scriptTibor Vass2016-03-221-10/+5
|\ | | | | Updated release.sh script to stop uploading binaries
| * Updated release.sh script to stop uploading binariesKen Cochrane2016-03-221-10/+5
| | | | | | | | Signed-off-by: Ken Cochrane <KenCochrane@gmail.com>
* | Merge pull request #21402 from crosbymichael/tar-binariesDavid Calavera2016-03-224-32/+31
|\ \ | | | | | | Add containerd and runc binaries to tgz output
| * | Export GOOS and GOARCH in subprocess for tgzMichael Crosby2016-03-224-8/+12
| | | | | | | | | | | | Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
| * | Copy containerd binaries in tgzMichael Crosby2016-03-221-0/+1
| | | | | | | | | | | | Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
| * | Add function for copy containerdMichael Crosby2016-03-223-30/+24
| |/ | | | | | | | | | | | | 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>
* | Merge pull request #21410 from calavera/vendor_engine_api_v0.3.0Sebastiaan van Stijn2016-03-221-1/+1
|\ \ | | | | | | Vendor engine-api v0.3.0
| * | Vendor engine-api v0.3.0David Calavera2016-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge pull request #21396 from aboch/vnnDavid Calavera2016-03-221-1/+1
|\ \ \ | |/ / |/| | Vendoring libnetwork v0.7.0-dev.10
| * | Vendoring libnetwork v0.7.0-dev.10Alessandro Boch2016-03-221-1/+1
| | | | | | | | | | | | Signed-off-by: Alessandro Boch <aboch@docker.com>
* | | Merge pull request #21303 from riyazdf/notary-vendor-docker1.11Tibor Vass2016-03-221-1/+1
|\ \ \ | |/ / |/| | vendor notary for docker1.11
| * | vendor notary for docker1.11Riyaz Faizullabhoy2016-03-221-1/+1
| | | | | | | | | | | | Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
* | | Merge pull request #21270 from ehazlett/resource-labelsTibor Vass2016-03-221-2/+2
|\ \ \ | |_|/ |/| | Add Label support for Images (build), Networks and Volumes on Creation
| * | add label support for build, networks and volumesEvan Hazlett2016-03-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge pull request #21341 from duglin/tweakBuildMichael Crosby2016-03-222-0/+30
|\ \ \ | |_|/ |/| | Add containerd/runc exes to bundle dir after build
| * | Add containerd/runc exes to bundle dir after buildDoug Davis2016-03-212-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge pull request #19439 from ↵Vincent Demeester2016-03-211-1/+1
|\ \ \ | | | | | | | | | | | | | | | | pcarrier/pcarrier/19438-async-connections-to-fluentd fluentd logger: support all options besides Unix sockets
| * | | bump fluent-logger-golang versionPierre Carrier2016-03-201-1/+1
| |/ / | | | | | | | | | | | | | | | This version supports async connections. Signed-off-by: Pierre Carrier <pierre@meteor.com>
* | | Merge pull request #21283 from runcom/update-testAlexander Morozov2016-03-211-1/+1
|\ \ \ | |_|/ |/| | vendor docker/distribution d06d6d3b093302c02a93153ac7b06ebc0ffd1793
| * | vendor docker/distribution d06d6d3b093302c02a93153ac7b06ebc0ffd1793Antonio Murdaca2016-03-191-1/+1
| | | | | | | | | | | | | | | | | | - fix and add integration tests Signed-off-by: Antonio Murdaca <runcom@redhat.com>
* | | Update vendored engine-api for OpenBSD supportFrank Groeneveld2016-03-211-1/+1
| | | | | | | | | | | | Signed-off-by: Frank Groeneveld <frank@frankgroeneveld.nl>
* | | Fix debian policy rulePaul Liljenberg2016-03-191-1/+1
| |/ |/| | | | | | | | | Fix issue in debian policy by removeing double quotes. Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com>
* | Vendor containerd, specs, runcTonis Tiigi2016-03-181-1/+4
| | | | | | | | Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
* | Vendor updated grpc, protobufTonis Tiigi2016-03-181-2/+2
|/ | | | Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
* Windows: revendor Microsoft/hcsshim to v0.1.0John Starks2016-03-171-1/+1
| | | | | | | | 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>
* Merge pull request #21003 from riyazdf/hardware-signing-gaTibor Vass2016-03-174-7/+5
|\ | | | | Move hardware signing out of experimental