a4ffd2d4e9
Add ltdl dependencies for aarch64
...
Fixes `make test` and fix #24380 on aarch64
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: d37a7394acd7842f588ef423fb076b05fccd1da2
Component: engine
2016-07-07 13:02:19 +01:00
c60ffac88e
Merge pull request #24383 from anusha-ragunathan/not-plugin
...
Detect non-plugin content during install and error out.
Upstream-commit: 656c66dd50d5c5b1f4f40eb4f3134e84e5b80fbc
Component: engine
2016-07-07 11:18:27 +02:00
c201e7c4a2
Merge pull request #24053 from cpuguy83/mounts_default_writable
...
Change defaults for mount writable and volume copying
Upstream-commit: 50674ec107a300067ded77912a2e39de88678c2c
Component: engine
2016-07-07 11:18:14 +02:00
508c55b4c2
Merge pull request #24330 from avsm/endpoint-cli-typo
...
make `docker service --help` text for `--endpoint-mode` more consistent
Upstream-commit: f85a231c5fc4159a5639228f6e13090637dfb6aa
Component: engine
2016-07-07 00:24:03 -07:00
3bc3d3b9a0
Change NAME to HOSTNAME in docs for docker node ls
...
In #24159 , the title field of `docker node ls` has been
changed from NAME to HOSTNAME. However, in the docs the
NAMEs are still used for the output of `docker node ls`.
This fix updates docs so that NAME field is changed to
HOSTNAME for all `docker node ls`.
This fix is related to #24159 and #24090 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 668b8a998f5ebbe66c7376c432a5fd87208add73
Component: engine
2016-07-06 20:23:53 -07:00
4894793d19
Merge pull request #24361 from coolljt0725/add_ip_ping
...
Install iproute2 and iputils-ping in Dockerfile.aarch64
Upstream-commit: 28e9d93f5201a8c352e9eb0d63e08660aa8fcf1d
Component: engine
2016-07-06 22:51:34 -04:00
7ac01fb32e
Use newer default values for mounts CLI
...
In the API:
`Writable` changed to `ReadOnly`
`Populate` changed to `NoCopy`
Corresponding CLI options updated to:
`volume-writable` changed to `volume-readonly`
`volume-populate` changed to `volume-nocopy`
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 56f3422468a0b43da7bae7a01762ce4f0a92d9ff
Component: engine
2016-07-06 22:34:39 -04:00
8d49a670d8
Detect non-plugin content during install and error out.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: d32df6d934875052232bbbc49fa473bd283af6e4
Component: engine
2016-07-06 18:49:39 -07:00
a70c2240b7
re-vendor swarmkit
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: db271b8833fc0b55998afababdaad60a67e3a982
Component: engine
2016-07-06 21:14:14 -04:00
892399249d
re-vendor engine-api
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 140ec59db6e413de5025fb8686b97bf80b66c519
Component: engine
2016-07-06 21:14:14 -04:00
6f5e6c31db
Merge pull request #24373 from floatingLomas/zsh-completion-fix
...
Remove unmatched bracket from _docker for zsh
Upstream-commit: a04a11f3e51a2c93c924384af6d4fcfa1cd42900
Component: engine
2016-07-06 16:54:16 -04:00
9ff9ce64f9
Merge pull request #24133 from cpuguy83/hacky_swarm_integration_tests
...
Implement service integration tests
Upstream-commit: 6f052edcc0c6558ca5b3d547109d9be72fe0176a
Component: engine
2016-07-06 11:49:27 -07:00
69d9702958
Install iproute2 and iputils-ping in Dockerfile.aarch64
...
ping and ip command are need in integration-cli test, but
they are missing in ubuntu:wily.
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 276e234ca0ec0fa20497b22f9a6d193e999d73cb
Component: engine
2016-07-06 16:48:51 +00:00
443b041acb
Merge pull request #24363 from runcom/fix-cross-push-digests
...
vendor docker/distribution 4e17ab5d319ac5b70b2769442947567a83386fbc
Upstream-commit: 6bf357561fbc0fd028503f85c589c849c83d7134
Component: engine
2016-07-06 18:17:51 +02:00
bc3a0408d7
Remove unmatched bracket from _docker for zsh
...
Signed-off-by: Jonathan Lomas <jonathan@floatinglomas.ca >
Upstream-commit: 7631dc80a6b1549b857192f44322fcee5e754254
Component: engine
2016-07-06 08:57:28 -07:00
cf21f8491a
integration-cli: ensure digest is the same after cross-repo push
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: a0c8970df1f013a51684f82dd86815dcf773a250
Component: engine
2016-07-06 13:12:42 +02:00
4a48f9104a
vendor docker/distribution 4e17ab5d319ac5b70b2769442947567a83386fbc
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 8aa37bdbb76a781d73c24800c2bc5373d2289c28
Component: engine
2016-07-06 13:12:37 +02:00
b214ee32d9
make docker service --help text for --endpoint-mode more consistent
...
Previously:
```
--constraint value Placement constraints (default [])
--endpoint-mode string Endpoint mode(Valid values: vip, dnsrr)
<snip>
--restart-condition string Restart when condition is met (none, on_failure, or any)
```
Now:
```
--constraint value Placement constraints (default [])
--endpoint-mode string Endpoint mode (vip or dnsrr)
<snip>
--restart-condition string Restart when condition is met (none, on_failure, or any)
```
Signed-off-by: Anil Madhavapeddy <anil@docker.com >
Upstream-commit: 2de9585f5ea798cbff23045d9d19ba239d5e5431
Component: engine
2016-07-06 12:10:28 +01:00
786983bb63
Merge pull request #24323 from avsm/better-leave-grammar
...
Improve the warning messages when leaving a Swarm cluster
Upstream-commit: c70e432cee7ce2052a729f85da31420b6c01d72c
Component: engine
2016-07-06 12:00:20 +02:00
e4dfc2d04c
Validate hostname starting from 1.24 API.
...
In order to keep a little bit of "sanity" on the API side, validate
hostname only starting from v1.24 API version.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 6daf3d2a783fd042e870c8af8bbd19fc28989505
Component: engine
2016-07-06 09:13:59 +02:00
4b7a3b82ea
Implement service integration tests
...
This is done in a hacky way as currently there is no better way.
Uses known implementation details about how tasks are scheduled to be
able to operate on the underlying container.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: e5ec575b32d6979914dce576f1b8bb71f3057cea
Component: engine
2016-07-05 21:39:42 -04:00
5cc35f4af8
Merge pull request #24351 from allencloud/add-file-close-in-loadBundlefile
...
fix severe fd leak in stack
Upstream-commit: ad44f49470bec84143ce73f51698bc9bbb501425
Component: engine
2016-07-05 17:45:34 -07:00
16a17d551d
fix severe fd leak in stack
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 0af04b613220060ef1fc21ca2f1d551f8f868af8
Component: engine
2016-07-06 07:00:39 +08:00
334cc7962a
Merge pull request #24347 from thaJeztah/cherry-pick-24325-to-master
...
Cherry-pick #24325 to master
Upstream-commit: 4f44ea315418808e5e68dd16879b3a4bd8c339a3
Component: engine
2016-07-05 15:27:32 -07:00
dd6992dc66
Merge pull request #24339 from aaronlehmann/image-spec-fix
...
image spec: Correct set of acceptable characters in tags
Upstream-commit: c014c9df884d7544124386c1dfc08630b4e90323
Component: engine
2016-07-06 00:14:03 +02:00
41cb211ef3
Merge pull request #24325 from Anvil/plugins_volume.md-unqiue
...
Fixed typo: s/unqiue/unique/g
(cherry picked from commit 84aa074d18d2f75f54564f21c2b5c0d1bcddd23f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f7d5c4367bc80b1de910c908f32b395b8eb78943
Component: engine
2016-07-05 15:11:04 -07:00
ba669263be
Merge pull request #24342 from thaJeztah/add-mike-as-curator
...
Add Mike as a curator
Upstream-commit: ecc3cfe41b337cb770d94af38cfb8814a70b0afb
Component: engine
2016-07-05 13:35:05 -07:00
48bf87974d
Merge pull request #24158 from mavenugo/smissues
...
Fixed a few network UI issues in swarm-mode
Upstream-commit: 5b4131681595b6f5304f3d94868a1642f92f2998
Component: engine
2016-07-05 20:28:20 +00:00
026db8e18b
Merge pull request #24307 from cyphar/remove-systemd-rlimits
...
contrib: systemd: set Limit* to infinity
Upstream-commit: 34a9e9d051824ef9ff2bb6147cec23ef03558b5c
Component: engine
2016-07-05 16:02:47 -04:00
bf5c518081
Merge pull request #24013 from dmcgowan/atomic-libtrust-key-file-write
...
Atomically save libtrust key file
Upstream-commit: 97aebe9a6c301bd7836042a171bfaae5652979fd
Component: engine
2016-07-05 15:28:41 -04:00
f3ff9e9f18
Merge pull request #24173 from vdemeester/tasks-filter-service-node-by-name
...
Allow service and node filter to be name in `tasks` subcommands
Upstream-commit: db75aa029d1843b3fdabb16c5cd9e1b3a99f39b2
Component: engine
2016-07-05 12:16:57 -07:00
add5c424d4
Add Mike as a curator
...
Mike is going to help us with triaging issues,
so adding him to the curators list to make it
official.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 156e77cb0db0c9cb127780fac583b5a38f84493a
Component: engine
2016-07-05 12:00:26 -07:00
014f1e30a3
Merge pull request #24335 from tophj-ibm/ppc64le-remove-go-sha-check
...
ppc64le: remove go SHA check
Upstream-commit: fd30292dd81a9543131a9b9099480fe0c5809ac2
Component: engine
2016-07-05 20:51:47 +02:00
3660e7a630
image spec: Correct set of acceptable characters in tags
...
The image spec did not match the regexp that validates tags. It
neglected to mention that period and dash characters are allowed in
tags, as long as they are not the first character. It also did not
mention the length limit for tags.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 2f19e910bdeee94a2962ce8457325e92aa21ce0e
Component: engine
2016-07-05 10:02:16 -07:00
cfca5f9c64
Merge pull request #24298 from allencloud/fix-stdout-and-stderr-in-api-client
...
fix stdout and stderr in api client
Upstream-commit: a44e0fedc2b69944f764dc82134e8aa0d12bde5d
Component: engine
2016-07-05 09:58:25 -07:00
eff3f9141a
Merge pull request #23996 from dmcgowan/always-store-image-digest-update
...
[carry 23503] Always store the image digest when pulling and pushing an image.
Upstream-commit: ee0283c97a44fd8e67f2df81d076eb4b1858b3d2
Component: engine
2016-07-05 16:18:20 +00:00
4306c5def3
Merge pull request #24191 from tonistiigi/mask-secrets
...
Mask swarm secrets from daemon logs
Upstream-commit: 55b8216279b40f6712ccdd46a6e2ac73c4bdbba0
Component: engine
2016-07-05 08:56:33 -07:00
b821a0da60
ppc64le: remove go SHA check
...
Makes it consistent with other Dockerfiles.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: d9e12cba5a9a2291f56eb3921b06ac1b5f85dfc7
Component: engine
2016-07-05 11:54:19 -04:00
60d7b2e452
fix stdout and stderr in api client
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 533bd82e41fee352962cb5ae0a49b9edbdebc25e
Component: engine
2016-07-05 23:07:40 +08:00
f2db9c3fd0
Merge pull request #24332 from allencloud/fix-typos
...
fix typos
Upstream-commit: dc31f4f6db5edff7c8554ec0725365a344bdec20
Component: engine
2016-07-05 16:29:29 +02:00
9921891219
fix typos
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: edc307cb9213d11d9c5911b08ebd921a097939c0
Component: engine
2016-07-05 20:42:17 +08:00
fb5eda0793
Merge pull request #24321 from F21/fix-grammatical-error
...
Fix a grammatical error in errClusterNetworkOnRun()'s error message.
Upstream-commit: feb7b4d0004f380767cd26ef60032fd839accb5b
Component: engine
2016-07-05 12:17:25 +02:00
7db75cd617
Merge pull request #24300 from coolljt0725/arm64_test
...
Add NoArm64 testRequires and skip Schema1RegistrySuite on arm64
Upstream-commit: 98fa9ef7d313d2b3da0d9f7826b5d47e2488973c
Component: engine
2016-07-05 12:13:30 +02:00
21a36cd129
Improve the warning messages when leaving a Swarm cluster
...
Signed-off-by: Anil Madhavapeddy <anil@docker.com >
Upstream-commit: 22a3d1fa209282e938ca16f31cce0dab4f35bf72
Component: engine
2016-07-05 09:14:23 +01:00
78dacb842c
Fix a grammatical error in errClusterNetworkOnRun()'s error message.
...
Signed-off-by: Francis Chuang <francis.chuang@boostport.com >
Upstream-commit: 1205a5584650388f36cda922556a31cbce827915
Component: engine
2016-07-05 16:18:06 +10:00
5ea7133a76
Fix typo - stacks being managed, not tasks?
...
Upstream-commit: 88da491cd9e2c2ea15df15654ac4d98f425d54ed
Component: engine
2016-07-04 11:13:57 -04:00
1e37a43b53
Add zsh completion for 'docker service' commands
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: f5d768e2c53f777e1add70f0e367e58db561842e
Component: engine
2016-07-04 15:14:58 +02:00
ec59bad07c
contrib: systemd: set Limit* to infinity
...
There is a not-insignificant performance overhead for all containers (if
containerd is a child of Docker, which is the current setup) if systemd
sets rlimits on the main Docker daemon process (because the limits
propogate to all children).
Signed-off-by: Aleksa Sarai <asarai@suse.de >
Upstream-commit: 8db61095a3d0bcb0733580734ba5d54bc27a614d
Component: engine
2016-07-04 23:00:28 +10:00
c1be799486
Merge pull request #24276 from sdurrheimer/zsh-completion-daemon-add-runtime
...
Add zsh completion for 'docker daemon --runtimes' and 'docker run --r…
Upstream-commit: d97233ca886d50afd060f3a4fe584ac8e51ea998
Component: engine
2016-07-04 14:40:56 +02:00
d949dcdf67
Merge pull request #24273 from sdurrheimer/zsh-completion-plugin
...
Add zsh completion for 'docker plugin' commands
Upstream-commit: 687c15f51822a5b059d446a9c090298cd9c2bfaf
Component: engine
2016-07-04 14:40:20 +02:00