a36f892b75
Merge pull request #32576 from cyli/re-vendor-swarmkit
...
Re-vendor swarmkit
Upstream-commit: 0083d557df0633b749285cee18ef06e67705c84f
Component: engine
2017-04-13 10:41:19 +02:00
83733587c4
Merge pull request #32589 from coreyfarrell/build-network-bash-completion
...
Fix bash-completion script.
Upstream-commit: aa22bcb652795d2b26381bba60dafb3fa17aa87e
Component: engine
2017-04-13 10:37:17 +02:00
2f2bd517f5
Merge pull request #32464 from allencloud/add-status-code-400-for-update-endpoint
...
add status code 400 for update endpoints in swagger.yml
Upstream-commit: 05930120a0dadd6bca293464b511623d39231f95
Component: engine
2017-04-13 10:33:04 +02:00
9b0f3956d8
Merge pull request #32449 from aaronlehmann/cluster-locking
...
cluster: Allow reentrant calls to methods during shutdown
Upstream-commit: 01c80435c6cef5730e51fa848b5771232b40e143
Component: engine
2017-04-12 18:58:12 -07:00
3797bbe864
Fix bash-completion script.
...
bash-completion script for 'docker build --network' calls
__docker_plugins, the correct name for this function is
__docker_plugins_bundled.
Closes #32588
Signed-off-by: Corey Farrell <git@cfware.com >
Upstream-commit: eede2056fedf1b9d18c0dce216d5adde0bd394da
Component: engine
2017-04-12 21:36:29 -04:00
9761c85b2e
Add tests to ensure we can add an external CA to the cluster without
...
error.
Signed-off-by: Ying Li <ying.li@docker.com >
Upstream-commit: 9b96b2d276cb719e764fb9a63c8c5f58c2f983b4
Component: engine
2017-04-12 16:55:48 -07:00
a8cbf4d0f4
Re-vendor swarmkit to a version which does not require all cluster updates
...
to include an external CA certificate when updating external CAs.
Signed-off-by: Ying Li <ying.li@docker.com >
Upstream-commit: e34bee387e0cba0da36b2c4b9113907933c32710
Component: engine
2017-04-12 16:55:47 -07:00
7cbfe4a756
Merge pull request #32463 from FengtuWang/fix_TestExecWithUserAfterLiveRestore2
...
fix TestExecWithUserAfterLiveRestore
Upstream-commit: bc4560e512b7a35340247af04f32bb6f8469f0e3
Component: engine
2017-04-12 16:52:35 -07:00
203ab34184
Merge pull request #32532 from dnephin/refactor-some-builder-parts
...
[builder] cleanup env dispatcher and Builder.build()
Upstream-commit: d2ab40e5b99bc2ab0abfea146544a20ce6081942
Component: engine
2017-04-12 11:11:06 -07:00
b2a8f5ff5d
Merge pull request #32506 from cpuguy83/cancellable_route
...
Use function arguments for route setup.
Upstream-commit: 480d1b841fd238788b75f31cd8ebe0b3a84f8eec
Component: engine
2017-04-12 14:10:50 -04:00
ad9aa60a5e
Merge pull request #32525 from cpuguy83/ensure_unmount_plugin
...
Make sure plugin rootfs is unmounted on upgrade
Upstream-commit: aa92df71b2d8e64ac9ddb2109b6ff0ddfcd0e556
Component: engine
2017-04-12 18:08:06 +02:00
866adfbbee
Merge pull request #28923 from erikh/fix-copy
...
Fix copy API (`docker cp`, etc) uid/gid handling
Upstream-commit: d40a17ffc2f6592396a3dfc0f5ebe396c2107536
Component: engine
2017-04-12 08:21:17 -07:00
cdb97bb321
Merge pull request #32370 from AkihiroSuda/improve-build-error
...
builder/dockerfile: improve error message about build stage name
Upstream-commit: 3c072598820e8b435151289ee0d8b74cb7e047ba
Component: engine
2017-04-12 16:33:23 +02:00
4de7d79620
Merge pull request #29807 from thaJeztah/update-frozen-images
...
Update frozen images in Dockerfiles
Upstream-commit: 330ddf8eb8f8a551677bdfc757fcefdb0cdaec3f
Component: engine
2017-04-12 15:37:40 +02:00
5f2d4821df
Merge pull request #32481 from yongtang/30740-docs-prune-label
...
Update docs of `label` filter for `docker system prune`
Upstream-commit: d0bd5aa2a7ad2561f067a0b9e470fc51ac2874a3
Component: engine
2017-04-12 15:37:04 +02:00
2c970161a0
Use function arguments for route setup.
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 08a39d7f02c526767072b08587a539f8d8a20bd4
Component: engine
2017-04-12 08:43:51 -04:00
4d6ef8b711
Merge pull request #32529 from runcom/relabel-secrets
...
daemon: relabel secrets path
Upstream-commit: 2aec48f44843016d13dfe4b5f53d29d0226fc769
Component: engine
2017-04-12 08:30:30 -04:00
1386ad9dee
daemon/archive.go: Fix copy routines to preserve UID.
...
This changes the long-standing bug of copy operations not preserving the
UID/GID information after the files arrive to the container.
Signed-off-by: Erik Hollensbe <github@hollensbe.org >
Upstream-commit: 8a7ff5ff746a77e0be601c11540562341b2228c1
Component: engine
2017-04-12 10:33:19 +00:00
7b2c24fd0f
Merge pull request #32473 from vdemeester/integration-cli-package-take3
...
[test-integration] Move FakeContext to `integration-cli/cli/build/fakecontext` package…
Upstream-commit: 2a17d048de7bf5a0152789617c83a318fac508e7
Component: engine
2017-04-12 10:24:49 +02:00
cc87542bde
Merge pull request #32539 from aaronlehmann/tag-hex-string
...
client: Allow hex strings as source references for ImageTag
Upstream-commit: 6672ffa566936dc7dc6e10b494b2a1567c536ddc
Component: engine
2017-04-12 09:52:56 +02:00
33f39daca5
Merge pull request #32544 from yuexiao-wang/fix-service-logs
...
Fix inconsistency for service logs
Upstream-commit: 18f90133ac4fe0b63745228c49eda441f6b91ecd
Component: engine
2017-04-12 09:51:15 +02:00
ac649e5b5e
Fix inconsisticy for service logs
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 78b2c1a84a3be4f0004ebd277d8a88eb0ac9d006
Component: engine
2017-04-12 22:43:14 +08:00
ba4754cea8
Merge pull request #32180 from joaofnfernandes/run-docs
...
Clean `docker run -e` reference docs
Upstream-commit: a0a977864f4160cca882bbe8cc72d944025f6fee
Component: engine
2017-04-12 09:34:30 +02:00
5aac0fb7d6
builder/dockerfile: improve error message about build stage name
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 50a9be4bf5b8a57acc455eaf7c3842b2df046f71
Component: engine
2017-04-12 05:27:39 +00:00
aeae50e71e
Make sure plugin rootfs is unmounted on upgraded
...
In some cases, if a user specifies `-f` when disabling a plugin mounts
can still exist on the plugin rootfs.
This can cause problems during upgrade where the rootfs is removed and
may cause data loss.
To resolve this, ensure the rootfs is unmounted
before performing an upgrade.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 83f44d232d2c5d7ce7c5e10d2cd0f912d32c2ea5
Component: engine
2017-04-11 21:09:15 -04:00
b94b999d77
Merge pull request #32030 from ehazlett/any-runtime
...
Support Swarmkit Generic Task Runtime
Upstream-commit: 3343653edb9a9c152c043de577effda1d528d6c0
Component: engine
2017-04-11 17:53:20 -07:00
862dffcf24
Remove unused Builder.Cancel()
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 068f344e032ad4489a88665adec683e06ad6f3c7
Component: engine
2017-04-11 20:33:13 -04:00
7c776ba71c
Clean docker run -e reference docs
...
Simplified the docs on how to set environment variables in a
container. Makes it clear that you have three options, and how
to use them.
Signed-off-by: Joao Fernandes <joao.fernandes@docker.com >
Upstream-commit: d11c1520f4f4f2c2a3206343f573024b92c42bce
Component: engine
2017-04-11 15:03:31 -07:00
640fde4eb4
client: Allow hex strings as source references for ImageTag
...
The source of a tag operation is allowed to be a 64-character hex
string. This means it should use ParseAnyReference for validation
instead of ParseNormalizedNamed.
This fixes a regression that happened in 17.04.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 4a0704cdbd1805d0d9ef046eb62a77352f1feab0
Component: engine
2017-04-11 13:37:04 -07:00
7ec6dbcc2e
Merge pull request #32059 from seriousben/support-dns-stack-file
...
add support for dns nameservers and search domains in stack files
Upstream-commit: 8a8c1961b58ef687e4a07002bdf1be4784ff7142
Component: engine
2017-04-11 21:32:52 +02:00
8df974860d
Update docs of label filter for docker system prune
...
This fix updates docs of `label` filter for `docker system prune`.
This fix is related to #30740 and #29999 , and specifically to comment
https://github.com/docker/docker/pull/30740#issuecomment-293012957 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 5b0ab45a1ef2ce52e78851f49a8390263e642263
Component: engine
2017-04-11 12:08:55 -07:00
8915598c83
Merge pull request #32488 from dnephin/docs-for-dockerfile-stdin
...
Add docs for reading Dockerfile from stdin
Upstream-commit: 9d4a8cda6baa29ad22b4bd0f3c63392b73bde8a7
Component: engine
2017-04-11 20:46:14 +02:00
a00fca972d
Remove unused id field from Builder.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a6abd57b83dc0aaf0cedeeb488c8a41262e46b7d
Component: engine
2017-04-11 14:44:32 -04:00
a5b8a0845e
Factor out functions from builder/dockerfile/builder.go:Builder.build()
...
Remove the block comment which is stale, and redundant now that the
function is just as readable as the comment.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: bfcd95817afaedb078022fc2f335ead64afee55c
Component: engine
2017-04-11 14:44:32 -04:00
6fb208126e
Cleanup in dispatcher.env
...
Remove commented code blocks
Remove some duplication in comparing and restructuring env
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c7fad9b750f8f143a22cc5a85a1dc26573025414
Component: engine
2017-04-11 14:44:28 -04:00
122c9b8aa8
Merge pull request #32536 from vieux/bump_api_and_version
...
bump API and version
Upstream-commit: 12601e3559ab880fc29c4fc2ad7031e74c931ca9
Component: engine
2017-04-11 14:27:21 -04:00
e5fb241134
bump API and version
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: b507158c0f0c6cbee52d3ff7e0278004d3486c9d
Component: engine
2017-04-11 11:21:55 -07:00
f0e93c44da
updated swagger with new fields for task spec
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: d6bb4ae434b9737fc392f98130b0be3d632d6bdc
Component: engine
2017-04-11 14:02:02 -04:00
3323cc5ab7
add service convert tests
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: dc762610ab538bb7909eeb6ca13ada83e3d409b4
Component: engine
2017-04-11 14:02:02 -04:00
26d7ec7da8
return exec.Controller instead of nil
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 3a9be929272d089d57745350b8888760a18b2526
Component: engine
2017-04-11 14:02:02 -04:00
3cad237312
updates for review comments
...
- runtimeUrl -> type_url
- runtimes -> runtime
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 8c2c69d31ec0ce4a9b125ca3cbf7b04ee81ce579
Component: engine
2017-04-11 14:02:01 -04:00
21134b3d48
filter services by runtime; default to container
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: f71bdc67a21a63b901e484a0650bea36d15eece5
Component: engine
2017-04-11 14:02:01 -04:00
5d661a7bc0
add support for swarmkit generic runtime
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: e06e2ef107ad09191bfea3dfe51cfa830114b54b
Component: engine
2017-04-11 14:02:01 -04:00
841b5bc44d
Merge pull request #32521 from mkumatag/update_shellwords
...
Vendor package update github.com/mattn/go-shellwords
Upstream-commit: 1a8206ca1fefdcc50577248bf27107499fa3d55e
Component: engine
2017-04-11 18:27:37 +02:00
5f5b71f0ea
Move FakeContext to integration-cli/cli/build/context package…
...
… and continue emptying `docker_utils_test.go` from build related function.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 56fb4653e8b867802d2a33121f933d164a4e6325
Component: engine
2017-04-11 18:25:49 +02:00
05a1048022
Merge pull request #32520 from thaJeztah/remove-ubuntu-12.04-precise
...
Remove Ubuntu 12.04 "precise pangolin" from build scripts
Upstream-commit: 595f1c4af2292676023ebc902382a56e452e19df
Component: engine
2017-04-11 18:05:18 +02:00
aaee4136fa
Merge pull request #32486 from dnephin/docs-for-arg-in-from
...
Add Dockerfile reference docs for using ARG in FROM
Upstream-commit: 74742dbeff37b544358c7f629032d2bfc6ec6acc
Component: engine
2017-04-11 17:45:02 +02:00
218a4e5c97
daemon: relabel secrets path
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: b11af7b2f686fe3724d0cfce260000a3d2b8fbc1
Component: engine
2017-04-11 17:43:23 +02:00
670f141a55
Add docs for reading Dockerfile from stdin.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e838679cd7954775cbe7ff72ef2da02dbe791fcb
Component: engine
2017-04-11 11:40:10 -04:00
0e1fc8025c
Add Dockerfile reference docs for using ARG in FROM
...
Also fixed some examples of using `docker build` to clarify that the
positional argument is a directory, not a file.
Also fixed some terminology. Dockerfiles contain instructions, not directives or
commands.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 3437715e20b3a1b16ea93a47802794b58b007863
Component: engine
2017-04-11 11:34:43 -04:00
