Commit Graph

23157 Commits

Author SHA1 Message Date
fbd88889d1 Merge pull request #21411 from mlaventure/fix-unauth-to-central
Update TestPushToCentralRegistryUnauthorized to match updated hub
Upstream-commit: 7bc052ae0449139bc0d6f2002c62cd849fb098bf
Component: engine
2016-03-22 20:31:10 -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
0436cacd63 Merge pull request #21406 from LK4D4/fix_streams_race
builder: synchronize stderr and stdout
Upstream-commit: fb1365639e7be8bb5e114de0b28e4a22c01530ee
Component: engine
2016-03-22 17:15:01 -07: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
48cef14de6 Merge pull request #21367 from mlaventure/containerd-docs-cleanup
Remove unneeded references to execDriver
Upstream-commit: 3ce494f48cc37b1e4065b62e58ec1c0a5df0e00c
Component: engine
2016-03-22 19:40:27 -04:00
7429b9c336 Update TestPushToCentralRegistryUnauthorized to match updated hub
The error message was changed from "unauthorized: access to the
requested resource is not authorized" to "unauthorized: authentication
required".

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 37e2103e640861b02a1ea0253df749a527a87e1b
Component: engine
2016-03-22 16:15:29 -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
11df489bb4 Merge pull request #21400 from LK4D4/fix_volumes_race
volume/local: fix race in List
Upstream-commit: 2ec1764d45de9269522cb084ec87c87dd6f3c4e0
Component: engine
2016-03-22 14:29:12 -07:00
66355ab0dd Merge pull request #21385 from tonistiigi/load-parent-chain
Add parent references support to load/save
Upstream-commit: acaec7f67cc67049182d162d2ac8ed7b5db90559
Component: engine
2016-03-22 14:07:06 -07:00
fd6a3ad797 builder: synchronize stderr and stdout
it's concurrent streams and should be synchronized before writing to response.
Otherwise there will be race in writing to *bufio.Writer in
net/http.response.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 3eb0a80f29629a1c022dc914437b176271d476fc
Component: engine
2016-03-22 13:57:29 -07: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
f18bd98fd4 Merge pull request #21383 from estesp/shared-userns-net-ipc
Allow net and IPC namespaces to be shared when userns=on
Upstream-commit: 62d45566544344b6f562bff7792976702ed8938b
Component: engine
2016-03-22 11:40:12 -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
efc6c29e8f volume/local: fix race in List
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 3536c09ceaa2d94a43a3a3228b096ba7a61f558d
Component: engine
2016-03-22 11:21:38 -07:00
85da9b3aae Merge pull request #21223 from cpuguy83/add_nocp_to_vols
Add explicit flags for volume cp/no-cp
Upstream-commit: de9ff4bdc0e17a0fd455790972d83133f424ef9d
Component: engine
2016-03-22 13:45:12 -04: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
8ddf12229f Merge pull request #21366 from martinmosegaard/master
Fix plural typo in 'save' command help
Upstream-commit: e8774fbb9f76a2ed7d02039a1a6c490fdbe0160c
Component: engine
2016-03-22 17:26:32 +01: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
20b3ca18bd Merge pull request #21388 from zhuguihua/move_zfs_options_to_correct_place_in_man_page
Move ZFS options to correct place in man page
Upstream-commit: 77203387133ecc2c5c1f40e8ea2f7b547adc2bd8
Component: engine
2016-03-22 08:26:54 +01:00
27791e6516 Update 'save' command help
Based on review feedback.

Signed-off-by: Martin Mosegaard Amdisen <martin.amdisen@praqma.com>
Upstream-commit: 5a701c3e4cd63f0b17b4fe9ab13c8cbe0ea5d353
Component: engine
2016-03-22 08:16:52 +01:00
748927baa7 Move ZFS options to correct place in man page
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
Upstream-commit: df6def3c0c1e2a566f3af3499865f8e9bf9da568
Component: engine
2016-03-22 14:50:49 +08:00
288aa38b5e Merge pull request #21046 from cyli/use-notary-cli
Sign all first-level delegation roles when doing a trusted push
Upstream-commit: 666563b190b7c97dc9db334ef03768ee8432b20e
Component: engine
2016-03-22 07:42:21 +01:00
ea0ebdf222 Merge pull request #21373 from aaronlehmann/client-user-agent-registry-operations
Pass upstream client's user agent through to registry on operations beyond pulls
Upstream-commit: 9f327b4c2805d3280e4e0ae6fe2d6522e8e753a7
Component: engine
2016-03-21 21:49:48 -07:00
f73bda8d49 Merge pull request #21354 from Microsoft/jjh/getpids
Windows: Minimal docker top implementation
Upstream-commit: adc6ed5a1051695cb488c57eea918d3c73566a04
Component: engine
2016-03-21 19:59:27 -07:00
d833f49cea Add parent references support to load/save
Restores the correct parent chain relationship
between images on docker load if multiple images
have been saved.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: faeff5118f710f7c4f6173c309b52aaba24118c9
Component: engine
2016-03-21 19:31:10 -07:00
19b58f8f21 Allow net and IPC namespaces to be shared when userns=on
Now that the namespace sharing code via runc is vendored with the
containerd changes, we can disable the restrictions on container to
container net and IPC namespace sharing when the daemon has user
namespaces enabled.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 2b278f48460453691c63ad81b0c87b50d8b18979
Component: engine
2016-03-21 22:20:26 -04:00
73e4af88e4 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>
Upstream-commit: 1bf5eb20e53b7e242792fcbe399cb997b6a2ba4b
Component: engine
2016-03-21 17:50:59 -07:00
308c81e7d4 Add explicit flags for volume cp/no-cp
This allows a user to specify explicitly to enable
automatic copying of data from the container path to the volume path.
This does not change the default behavior of automatically copying, but
does allow a user to disable it at runtime.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b0ac69b67ef79c6c937f84bee3df20a1924ad334
Component: engine
2016-03-21 20:38:44 -04:00
9dcdb80e65 Merge pull request #21377 from LK4D4/fix_compile
runconfig/opts: fix compilation issue
Upstream-commit: c22d09f56336b31a0569c424957b13f7baf01a92
Component: engine
2016-03-21 19:11:09 -04:00
5efc6535dd runconfig/opts: fix compilation issue
it was introduced with #20566 as a result of merge

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 93f57705110e196dca1cf2b2ce7d261ee97b9e4e
Component: engine
2016-03-21 15:01:08 -07:00
63511e795d Merge pull request #20566 from AndrewGuenther/20371-validate-hostname
Ensure --hostname is valid
Upstream-commit: f9f8708dc661a5a433642fddcbde1d2eb5461893
Component: engine
2016-03-21 14:49:16 -07:00
87c76eb0d7 Pass upstream client's user agent through to registry on operations beyond pulls
This adds support for the passthrough on build, push, login, and search.

Revamp the integration test to cover these cases and make it more
robust.

Use backticks instead of quoted strings for backslash-heavy string
contstands.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: c44e7a3e632c3ea961cb8c12ba45371f54e6699c
Component: engine
2016-03-21 14:31:47 -07:00
6c1d291a31 Merge pull request #21306 from mgoelzer/issue20001-nodeps
Pass upstream client's user agent through to registry on image pulls
Upstream-commit: 278d3962a8cb6a42e9841789bdb8b49a29617e24
Component: engine
2016-03-21 14:26:59 -07:00
a369a60b8b Merge pull request #21301 from cpuguy83/cleaner_file_log
Fixes some issues with jsonfile write/read
Upstream-commit: 11b4c89087cb7d6014e6106521ebb92fa74d01ab
Component: engine
2016-03-21 14:03:36 -07:00
8fe817f6cc Merge pull request #21106 from yongtang/20122-volume-one-character
Fix one-character directory issue in the volume option (#20122).
Upstream-commit: 3ac32cd72e2cbb4201666a260ef8b2b740c6bc78
Component: engine
2016-03-21 16:41:03 -04:00
bf213f3332 Remove unneeded references to execDriver
This includes:
 - updating the docs
 - removing dangling variables

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 8af4f89cba09105f3d581926aca6e231326f7054
Component: engine
2016-03-21 13:06:08 -07:00
5039737b8d Include documentation on how to add the targets/releases delegation to a repo
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 88d73ebff43ef6031f169e8333f2d67e4f4f9d93
Component: engine
2016-03-21 12:06:10 -07:00
ffcbf49a63 Pull, Pull-A, and Build will only pull tags from the targets role or the targets/releases role.
It will ignore tags in all other delegation roles.

Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 623ccc2f319ec28929c75a09bba76916c84f0d2b
Component: engine
2016-03-21 10:56:49 -07:00
39ea52c5c0 Add test for targets/releases preference when pulling
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: ca57f4e6a8ac7861009d03957e1b508036eac98f
Component: engine
2016-03-21 10:56:42 -07:00
18495acb39 Trusted push now adds the tag to every first level delegation role for which we have keys
and for which the tag conforms to path restrictions.

Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 497a58e6e48277bbee214d701e3d671eb8975797
Component: engine
2016-03-21 10:56:09 -07:00
6d6fe29dc2 Merge pull request #21360 from WeiZhang555/clean
Clean dead code
Upstream-commit: 7bbf58ed0d60e26a6514ac8219277ffb8ca63d17
Component: engine
2016-03-21 18:42:10 +01:00
f1f7a4b7fc Merge pull request #19439 from pcarrier/pcarrier/19438-async-connections-to-fluentd
fluentd logger: support all options besides Unix sockets
Upstream-commit: d82ad12df813824d9166478068536d7d78cf0b69
Component: engine
2016-03-21 18:09:14 +01:00