3acb466f2d
Merge pull request #21695 from kencochrane/change_tgz_to_zip_on_windows
...
Change the windows bundle from a .tgz to a .zip file
2016-03-31 18:40:37 -04:00
fda99a7e16
Change the windows .tgz to a .zip file
...
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2016-03-31 15:56:13 -04:00
00031c15b5
Merge pull request #21679 from tonistiigi/no-pivot-root
...
Bring back support for DOCKER_RAMDISK
2016-03-31 12:40:57 -07:00
8a4225cd5a
Bring back support for DOCKER_RAMDISK
...
Fixes #21631
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-03-31 10:29:32 -07:00
60821fe288
Merge pull request #21665 from cyphar/bump-runc
...
vendor: bump runc to 2441732d6fcc0fb0a542671a4372e0c7bc99c19e
2016-03-31 11:38:57 +02:00
90bb5301b5
Vendor Libnetwork v0.7.0-rc.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>
2016-03-30 18:12:23 -07:00
da38ac6c79
vendor: bump runc to 2441732d6fcc0fb0a542671a4372e0c7bc99c19e
...
Also modify an integration test that hardcoded the error string so it
uses the exported error variable from libcontainer/user.
Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-03-31 11:20:38 +11:00
8c06ba3665
Merge pull request #21625 from kencochrane/fix_tgz_directory
...
Change the directory inside of tgz files.
2016-03-30 13:11:55 -07:00
d800be743d
Merge pull request #21591 from riyazdf/hardware-signing-non-experimental
...
move hardware signing out of experimental, remove yubico-piv-tool deps
2016-03-30 00:09:22 -04:00
7df5b32834
Change the directory inside of tgz files.
...
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>
2016-03-29 14:39:28 -04:00
d78f8f2796
Merge pull request #21608 from albers/build-clone-https
...
Use https for `git clone` in build
2016-03-29 11:30:35 -07:00
0fa96f2463
Merge pull request #21593 from aboch/bdvnd
...
Vendoring boltb/bolt v1.2.0
2016-03-29 11:29:30 -07:00
a7e9bf6cb7
Use https for `git clone` in build
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-03-29 09:35:42 +02:00
eeaf14395e
Merge pull request #21541 from yongtang/20909-engine-api
...
Update vendored engine-api to e37a82dfcea64559ca6a581776253c01d83357d9.
2016-03-28 19:01:15 -07:00
16bf3eede0
Vendoring boltb/bolt v1.2.0
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-03-28 15:49:41 -07:00
8d18e6b30f
move hardware signing out of experimental, remove dependencies to yubico-piv-tool
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-03-28 14:33:06 -07:00
270562f439
Update vendored engine-api to e37a82dfcea64559ca6a581776253c01d83357d9.
...
This PR updates vendored engine-api to e37a82dfcea64559ca6a581776253c01d83357d9
in order to support `SecurityOptions` in `Info`.
See #20909 , #21172 for details related to `SecurityOptions`.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-03-28 13:38:15 +00:00
477fe4846a
Add support for repeating integration tests
...
`TEST_REPEAT=n` runs the test suite again n times or
until the first failure without doing building and
daemon setup. Useful for debugging flaky tests.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-03-26 23:05:55 -07:00
2c224fb06a
Merge pull request #21509 from kencochrane/add_better_unsupported_message
...
Added a better message for when we build an unsupported Docker version
2016-03-25 13:46:41 -04:00
996138bf8e
Fix release scripts
...
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>
2016-03-25 11:55:26 -04:00
181d2725d7
Added a better message for when we build an unsupported version
...
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2016-03-25 10:09:03 -04:00
36458b5787
Merge pull request #21501 from tonistiigi/fix-deb-init-symlinks
...
Fix symlink copying for deb init scripts
2016-03-25 01:08:09 -07:00
61277c395b
Fix symlink copying for deb init scripts
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-03-24 23:15:17 -07:00
dd33d18045
Revert "Merge pull request #21003 from riyazdf/hardware-signing-ga"
...
This reverts commit e6d3a9849cd3afe34b51
2016-03-24 21:12:52 -07:00
ed25df9a07
Merge pull request #21387 from kencochrane/change_packages
...
Packaging changes required for new containerd binaries
2016-03-24 17:29:55 -04:00
bb66d7144f
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>
2016-03-24 16:25:33 -04:00
e88dff6bb4
Merge pull request #21435 from vdemeester/remove-verbose-copy-containerd
...
Remove the verbosity of copy_containerd
2016-03-24 10:34:37 -07:00
2164018d82
Remove the verbosity of copy_containerd
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-03-23 20:51:48 +01:00
58385bc8a5
Vendor engine-api 0.3.1.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-03-23 15:05:19 -04:00
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
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
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
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
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
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
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
506fb9810c
Merge pull request #21396 from aboch/vnn
...
Vendoring libnetwork v0.7.0-dev.10
2016-03-22 15:09:42 -07:00
8b8fcb796f
Merge pull request #21303 from riyazdf/notary-vendor-docker1.11
...
vendor notary for docker1.11
2016-03-22 17:57:17 -04:00
fbdb3c3a4b
Vendoring libnetwork v0.7.0-dev.10
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-03-22 12:36:21 -07:00
aca7e73a69
Copy containerd binaries in tgz
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-22 12:23:17 -07:00
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
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
ab3772f72f
vendor notary for docker1.11
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-03-22 11:28:19 -07:00
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
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
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
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
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
a05fdd6806
Merge pull request #21283 from runcom/update-test
...
vendor docker/distribution d06d6d3b09
2016-03-21 09:46:28 -07:00
3cf8a9ede7
Update vendored engine-api for OpenBSD support
...
Signed-off-by: Frank Groeneveld <frank@frankgroeneveld.nl>
2016-03-21 12:11:11 +01:00
Tibor Vass
Ken Cochrane
David Calavera
Tonis Tiigi
Antonio Murdaca
Madhu Venugopal
Aleksa Sarai
Harald Albers
Sebastiaan van Stijn
Alessandro Boch
Riyaz Faizullabhoy
Yong Tang
Brian Goff
Tibor Vass
cyli
Vincent Demeester
Michael Crosby
Evan Hazlett
Doug Davis
Alexander Morozov
Frank Groeneveld