e6a7fb2bb7
Merge pull request #21780 from sanimej/libn-v0.7rc2
...
Vendor Libnetwork v0.7.0-rc.3
Upstream-commit: a79e79c58e7da0ab8519e708271f0e45a341c3d2
Component: engine
2016-04-06 13:54:21 -04:00
219d5e639e
Vendor Libnetwork v0.7.0-rc.3
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: 5b892819a60a0a91c168c6a2c1e22c958be143ca
Component: engine
2016-04-05 22:01:19 -07:00
ac4137daba
Define readonly/mask paths in spec
...
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 >
Upstream-commit: 3f81b4935292d5daedea9de4e2db0895986115da
Component: engine
2016-04-04 18:55:55 -07:00
f53ac495f0
Fixed a typo in release.sh
...
Signed-off-by: Ken Cochrane <kencochrane@gmail.com >
Upstream-commit: e7d54a4133a17c480f143530580f5734f835c5fe
Component: engine
2016-04-04 09:27:14 -04:00
dd687168c2
Merge pull request #21695 from kencochrane/change_tgz_to_zip_on_windows
...
Change the windows bundle from a .tgz to a .zip file
Upstream-commit: 3acb466f2d28ffd4bd0567778d9798460d386e5a
Component: engine
2016-03-31 18:40:37 -04:00
7cbc25f5ba
Change the windows .tgz to a .zip file
...
Signed-off-by: Ken Cochrane <kencochrane@gmail.com >
Upstream-commit: fda99a7e1653e045ec5901955a59ff1123016d93
Component: engine
2016-03-31 15:56:13 -04:00
087b91dfb7
Merge pull request #21679 from tonistiigi/no-pivot-root
...
Bring back support for DOCKER_RAMDISK
Upstream-commit: 00031c15b5b2226292eb9575bc3b390bdcd83a56
Component: engine
2016-03-31 12:40:57 -07:00
1917da0dad
Bring back support for DOCKER_RAMDISK
...
Fixes #21631
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 8a4225cd5ad3ad56a7e896f675080c0ed38982a3
Component: engine
2016-03-31 10:29:32 -07:00
09b74b88c4
Merge pull request #21665 from cyphar/bump-runc
...
vendor: bump runc to 2441732d6fcc0fb0a542671a4372e0c7bc99c19e
Upstream-commit: 60821fe288ce1c53fdf5ab553b9f1d4571f1ec11
Component: engine
2016-03-31 11:38:57 +02:00
e7c442dff1
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 >
Upstream-commit: 90bb5301b51ec6a6c77b910855441feef10492ff
Component: engine
2016-03-30 18:12:23 -07:00
b856d3bee3
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 >
Upstream-commit: da38ac6c79fe902ed0687afc73d731c95c6d491a
Component: engine
2016-03-31 11:20:38 +11:00
7c19f87137
Merge pull request #21625 from kencochrane/fix_tgz_directory
...
Change the directory inside of tgz files.
Upstream-commit: 8c06ba366555ef2ac98ca5372ea632a28e37c950
Component: engine
2016-03-30 13:11:55 -07:00
b882239dcc
Merge pull request #21591 from riyazdf/hardware-signing-non-experimental
...
move hardware signing out of experimental, remove yubico-piv-tool deps
Upstream-commit: d800be743db5bcd1bfdcd948619af5811ff7aec8
Component: engine
2016-03-30 00:09:22 -04:00
d096d13747
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 >
Upstream-commit: 7df5b32834237eac4c338f0ce1cba65b86bbe642
Component: engine
2016-03-29 14:39:28 -04:00
693174fcad
Merge pull request #21608 from albers/build-clone-https
...
Use https for `git clone` in build
Upstream-commit: d78f8f2796bd9b2370f817dacca0b27d8601ff4c
Component: engine
2016-03-29 11:30:35 -07:00
0610ad67ff
Merge pull request #21593 from aboch/bdvnd
...
Vendoring boltb/bolt v1.2.0
Upstream-commit: 0fa96f246312661416bd8ea5010dc1a77a769323
Component: engine
2016-03-29 11:29:30 -07:00
eecbb6fc3c
Use https for git clone in build
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: a7e9bf6cb70117005dbcd4a987a7f30e3c605656
Component: engine
2016-03-29 09:35:42 +02:00
ce89a82639
Merge pull request #21541 from yongtang/20909-engine-api
...
Update vendored engine-api to e37a82dfcea64559ca6a581776253c01d83357d9.
Upstream-commit: eeaf14395e05b331b82d429d161f5d76f7b1837d
Component: engine
2016-03-28 19:01:15 -07:00
1191a5e1ef
Vendoring boltb/bolt v1.2.0
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 16bf3eede024f2efd088c6209e0042a040a9b8fb
Component: engine
2016-03-28 15:49:41 -07:00
8080d1d7e4
move hardware signing out of experimental, remove dependencies to yubico-piv-tool
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 8d18e6b30f0a33463c749079d87cad8fa9c19d52
Component: engine
2016-03-28 14:33:06 -07:00
857efac1d1
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 >
Upstream-commit: 270562f439684a8fca84617ab7ceb494b7afd301
Component: engine
2016-03-28 13:38:15 +00:00
4ae1bedbae
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 >
Upstream-commit: 477fe4846ac72a77d7b045d1b5619bc7cfdbb9aa
Component: engine
2016-03-26 23:05:55 -07:00
f97f5ba239
Merge pull request #21509 from kencochrane/add_better_unsupported_message
...
Added a better message for when we build an unsupported Docker version
Upstream-commit: 2c224fb06ad3c20ca9c32ee733904b3478c60a7b
Component: engine
2016-03-25 13:46:41 -04:00
75761ed816
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 >
Upstream-commit: 996138bf8e6acde9a937755ef81459f7d7566fc9
Component: engine
2016-03-25 11:55:26 -04:00
d3263a9591
Added a better message for when we build an unsupported version
...
Signed-off-by: Ken Cochrane <kencochrane@gmail.com >
Upstream-commit: 181d2725d7ac8da5174b1a13d3ee413057af57b8
Component: engine
2016-03-25 10:09:03 -04:00
44f1573820
Merge pull request #21501 from tonistiigi/fix-deb-init-symlinks
...
Fix symlink copying for deb init scripts
Upstream-commit: 36458b578759839e101c8a7774ff9a0aa64abadc
Component: engine
2016-03-25 01:08:09 -07:00
38763b6eb2
Fix symlink copying for deb init scripts
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 61277c395bf0f9b560e684085d0a134406a7c179
Component: engine
2016-03-24 23:15:17 -07:00
ba23c7ef71
Revert "Merge pull request #21003 from riyazdf/hardware-signing-ga"
...
This reverts commit e6d3a9849c96201681915944947a0e5452619929, reversing
changes made to d3afe34b51e7588984cc21a2f48da116645e52e3.
Signed-off-by: cyli <cyli@twistedmatrix.com >
Upstream-commit: dd33d18045e50a198d3d75db8fba12f126e93937
Component: engine
2016-03-24 21:12:52 -07:00
4295dceddb
Merge pull request #21387 from kencochrane/change_packages
...
Packaging changes required for new containerd binaries
Upstream-commit: ed25df9a07f4b0ddf21fed5358eba8870fb06a9c
Component: engine
2016-03-24 17:29:55 -04:00
7e9cc10806
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 >
Upstream-commit: bb66d7144f7d0a617f5985486ae36bbbaa5461ba
Component: engine
2016-03-24 16:25:33 -04:00
3e065ccb2e
Merge pull request #21435 from vdemeester/remove-verbose-copy-containerd
...
Remove the verbosity of copy_containerd
Upstream-commit: e88dff6bb46edd546e5f6cbe775f1234ca757834
Component: engine
2016-03-24 10:34:37 -07:00
d716d49ce7
Remove the verbosity of copy_containerd
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 2164018d82a7c9857c8196b863a538f5d47f5265
Component: engine
2016-03-23 20:51:48 +01:00
345460db06
Vendor engine-api 0.3.1.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 58385bc8a51e538f64a0d91c3259f20c6c289c86
Component: engine
2016-03-23 15:05:19 -04:00
661ca233b2
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 >
Upstream-commit: dd51e85c050076be09fc7414bda1f261b61e60ad
Component: engine
2016-03-23 11:59:21 -04:00
ce07920e99
Add docker- prefix to runc and containerd binaries
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 009399dc8ed8a4b635b0e229bf07b685e286d8d9
Component: engine
2016-03-23 00:52:16 -04:00
5b78a9f38b
Merge pull request #21397 from kencochrane/update-release-script
...
Updated release.sh script to stop uploading binaries
Upstream-commit: d0d17a069371663b6ad60b0edb5d9beb5d9a175b
Component: engine
2016-03-22 20:29:16 -04:00
e4e6a18b3d
Merge pull request #21402 from crosbymichael/tar-binaries
...
Add containerd and runc binaries to tgz output
Upstream-commit: d02d48b4b19f327fdcfcc220f4c8154274b017f5
Component: engine
2016-03-22 17:11:34 -07:00
8d85f36ce3
Merge pull request #21410 from calavera/vendor_engine_api_v0.3.0
...
Vendor engine-api v0.3.0
Upstream-commit: 28af4789e6a183d3b684b9cf7f0061607a4e6a13
Component: engine
2016-03-22 16:41:10 -07:00
8c7ac04699
Export GOOS and GOARCH in subprocess for tgz
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 5ff66748daecb9674b22983b84ac95c76e04ed00
Component: engine
2016-03-22 15:43:06 -07:00
0ce4c48e11
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 >
Upstream-commit: 9e9c73a52893e658e391dfc44d4cea38fa6af980
Component: engine
2016-03-22 18:12:16 -04:00
0ff9a3fc56
Merge pull request #21396 from aboch/vnn
...
Vendoring libnetwork v0.7.0-dev.10
Upstream-commit: 506fb9810c60177b360b9dabab516828b90ffc48
Component: engine
2016-03-22 15:09:42 -07:00
2e2ed4c31e
Merge pull request #21303 from riyazdf/notary-vendor-docker1.11
...
vendor notary for docker1.11
Upstream-commit: 8b8fcb796f85bc8f5146fa61ce667699f0436591
Component: engine
2016-03-22 17:57:17 -04:00
26e4c9db49
Vendoring libnetwork v0.7.0-dev.10
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: fbdb3c3a4b15720c0df3a59d4bef0773b365c2b1
Component: engine
2016-03-22 12:36:21 -07:00
bf2f934743
Copy containerd binaries in tgz
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: aca7e73a69c13ec0e64cc60a9ebfeb92aca3d9a6
Component: engine
2016-03-22 12:23:17 -07:00
02220a45c4
Merge pull request #21270 from ehazlett/resource-labels
...
Add Label support for Images (build), Networks and Volumes on Creation
Upstream-commit: 53d2e5e9d754ce8fbef733759e9ec450514133e3
Component: engine
2016-03-22 15:12:33 -04:00
dbc8de7ddc
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 >
Upstream-commit: 78568f2eb54a6455dad566923f3c6f03ac300405
Component: engine
2016-03-22 12:06:56 -07:00
20a8382c82
vendor notary for docker1.11
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: ab3772f72fcb189c742510326069474ea625042f
Component: engine
2016-03-22 11:28:19 -07:00
83b965a846
Updated release.sh script to stop uploading binaries
...
Signed-off-by: Ken Cochrane <KenCochrane@gmail.com >
Upstream-commit: 5e3a8ef887f9a2721338c574781a927ad28d881e
Component: engine
2016-03-22 13:42:54 -04:00
e0cc65519d
Merge pull request #21341 from duglin/tweakBuild
...
Add containerd/runc exes to bundle dir after build
Upstream-commit: 0dcdd1c5b84c4a066882ea52dd81b5b3a624897a
Component: engine
2016-03-22 10:29:56 -07:00
fe56b4ef22
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 >
Upstream-commit: fc214b4408d915e3510f61c7584ca01c176d1373
Component: engine
2016-03-22 11:49:06 -04:00
