f0e9eeb33f
Merge pull request #24465 from LK4D4/restart_cluster_test
...
integration-cli: add test for restarting entire swarm cluster
Upstream-commit: 08a2fd7e2e95c235225e796b8b6d4c89478394ea
Component: engine
2016-07-12 13:12:33 -07:00
3b51db3f13
Merge pull request #24544 from sfsmithcha/network_plugins_swarm_mode
...
author merge: add caveat for network plugins in swarm mode
Upstream-commit: cbdce5800896a15b3a19c0178a7e367ac7072af5
Component: engine
2016-07-12 13:05:05 -07:00
b2c20d32a7
add caveat for network plugins in swarm mode
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 9ae64de6143451b0c3a3b2fe368b1c365b10e1a4
Component: engine
2016-07-12 11:50:34 -07:00
832af6ffb8
Merge pull request #24528 from rsippl/24526-empty-services-list
...
Return an empty services list if no services are running
Upstream-commit: 79432b436793b9850f50de38166740698aca41bf
Component: engine
2016-07-12 18:31:28 +00:00
9b4a3ab43b
Merge pull request #24518 from dmcgowan/overlay2-override-kernel-check
...
Allow option to override kernel check in overlay2
Upstream-commit: a44f0107023aa62d202b068c0a8d4b5ad0640838
Component: engine
2016-07-12 19:22:27 +02:00
944503693f
Add API test for empty services list
...
Signed-off-by: Ralf Sippl <ralf.sippl@gmail.com >
Upstream-commit: 65e72133a11ea3e6873f62039956bbd70548a5a7
Component: engine
2016-07-12 17:31:44 +02:00
9977473f3d
Merge pull request #24520 from aaronlehmann/no-retry-on-unknown-repository
...
Don't retry push on an unknown repository
Upstream-commit: 10d5d08c48d6de61213d7ac5167e4d3589d44df8
Component: engine
2016-07-12 11:17:29 -04:00
36cae188de
Merge pull request #24146 from johnharris85/fix-swarm-update-auto-accept
...
Add comma-separated --auto-accept support.
Upstream-commit: 7da11b1afda5f42d07b7304a7edcd1886434d9ed
Component: engine
2016-07-12 16:29:21 +02:00
72b8b61ad0
Merge pull request #24532 from yongtang/07122016-typo-docs
...
Fix a minor typo in swarm tutorial docs
Upstream-commit: 71d404e2bc0cb5952aeb0c3e0e28bdb32d84b276
Component: engine
2016-07-12 08:03:53 -04:00
eb5386f068
Fix a minor typo in swarm tutorial docs
...
This fix fixes a minor typo in swarm tutorial's delete service docs.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 93fa7e75553c3332314b3b988f7082cfde857475
Component: engine
2016-07-12 05:00:39 -07:00
048f3b1b85
Merge pull request #24504 from hqhq/soften_update_kmem
...
Soften limitation of update kernel memory
Upstream-commit: 110b2aecda9625dd5679733686d1cc169f87a463
Component: engine
2016-07-12 13:58:17 +02:00
9910f511b8
Merge pull request #24519 from thaJeztah/add-pidmode-api-docs
...
Add missing API docs for HostConfig.PidMode
Upstream-commit: c7b283bbe3df5fe7a13340deab44d52a5a40ad5e
Component: engine
2016-07-12 12:31:58 +02:00
ab7f449517
Merge pull request #24522 from hairyhenderson/clarify-build-args-secret-warning
...
Clarify warning against using build-time variables for secrets
Upstream-commit: 024b467ebef4a0dddce2ca382acad6a07be1d756
Component: engine
2016-07-12 12:13:37 +02:00
52fb31b62e
Return an empty services list if no services are running
...
Signed-off-by: Ralf Sippl <ralf.sippl@gmail.com >
Upstream-commit: c8e4e95db9b0d3115435b8f0e94c78a2e0cb92d0
Component: engine
2016-07-12 11:41:04 +02:00
fa96a03fc7
Merge pull request #24464 from tonistiigi/waitandassert
...
Use waitAndAssert to test node state changes
Upstream-commit: 1685b605a83d6dcfd0dc97ce394a435711805de4
Component: engine
2016-07-12 10:05:55 +02:00
1da671b499
Merge pull request #24229 from anusha-ragunathan/shutdown-plugins
...
Shutdown plugins during daemon shutdown.
Upstream-commit: b91e2dd9942f4c34b62de37c3862b9febd270b22
Component: engine
2016-07-11 22:14:50 -04:00
fb15fd3401
Clarify warning against using build-time variables for secrets
...
Signed-off-by: Dave Henderson <dhenderson@gmail.com >
Upstream-commit: 9af24ba3ac9c2efbb8ec7edef4668650a3c31834
Component: engine
2016-07-11 21:21:33 -04:00
1a97e07ac0
Soften limitation of update kernel memory
...
Kernel memory is not allowed to be updated if container is
running, it's not actually a precise kernel limitation.
Before kernel version 4.6, kernel memory will not be accounted
until kernel memory limit is set, if a container created with
kernel memory initialized, kernel memory is accounted as soon
as process created in container, so kernel memory limit update
is allowed afterward. If kernel memory is not initialized,
kernel memory consumed by processes in container will not be
accounted, so we can't update the limit because the account
will be wrong.
So update kernel memory of a running container with kernel memory
initialized is allowed, we should soften the limitation by docker.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 08c7075c403b86111b2c393b49075a81a1d2263f
Component: engine
2016-07-12 08:07:24 +08:00
e7b616d2c8
Don't retry push on an unknown repository
...
If the remote registry responds with a NAME_UNKNOWN error, treat this as
a fatal error and don't retry the push.
Tested against an ECR registry.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: a12ab28e0afb8dd0a05187989dd95c9b9ca3fd68
Component: engine
2016-07-11 18:06:23 -06:00
9557e1e984
Merge pull request #24501 from hqhq/remove_exec_driver
...
Remove execution driver
Upstream-commit: 880484992c360881dc57a3317b84d75300c358af
Component: engine
2016-07-11 16:54:36 -07:00
32cd0213a9
Add missing API docs for HostConfig.PidMode
...
The `--pid` flag was added in Docker 1.5.0, but the
API changes were not documented. In Docker 1.12.0,
`--pid=container:<name|id>` was added as an additional
option, but also undocumented.
This adds the missing API documentation for this
option.
Also see commits
47e3da848ffbe88d0188ae6cfc09d6e1668bc293 (for 1.5.0), and
ebeb5a0422be47e703353e327606a380eb9962ab (for 1.12.0).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2c9b5addc5022dba33d5d0443b49b2e4c0041ef3
Component: engine
2016-07-12 01:52:42 +02:00
a5531ff991
Allow option to override kernel check in overlay2
...
Add option to skip kernel check for older kernels which have been patched to support multiple lower directories in overlayfs.
Fixes #24023
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: ff98da0607c4d6a94a2356d9ccaa64cc9d7f6a78
Component: engine
2016-07-11 16:48:08 -07:00
cb38cf39e2
Add support for comma-separated --auto-accept syntax.
...
Signed-off-by: John Harris <john@johnharris.io >
Upstream-commit: 8e148827734a94165156adfd0f6d202d28dff142
Component: engine
2016-07-11 15:47:04 -07:00
b2f48d18dd
integration-cli: add test for restarting entire swarm cluster
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: ae4137ae3cc6ee479f5e7f86f9859b485473285a
Component: engine
2016-07-11 14:48:57 -07:00
dac465995a
Merge pull request #23513 from mansinahar/update-content-trust-doc
...
Change content-trust doc to not point to images that don't exist #22730
Upstream-commit: 6dc2dd441024021ef8ca09746286e880efac64d1
Component: engine
2016-07-11 23:42:53 +02:00
495149133d
Shutdown plugins during daemon shutdown.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 863ab9ab134d0baef3c7e5d745eded891e87e734
Component: engine
2016-07-11 14:21:27 -07:00
4451288540
Merge pull request #24427 from swernli/remove_custom_images
...
Removing Custom Images support
Upstream-commit: b215c4c9748c008b5bdcd3ea267ac21e666da1ff
Component: engine
2016-07-11 14:01:41 -07:00
7fcae13aa7
Merge pull request #24474 from mavenugo/fix-24452
...
swarmkit expects network-id for as target
Upstream-commit: 36f3d4af233acd7c32caf94ed98ccee4585cc1f7
Component: engine
2016-07-11 20:59:38 +02:00
399c37eb85
Merge pull request #24051 from allencloud/return-err-when-stack-name-nonexist
...
output some details when stack name does not exist
Upstream-commit: 46649755f8771e38b2c74352327a226f1c995843
Component: engine
2016-07-11 20:43:09 +02:00
76868ad0c3
Merge pull request #24471 from joaofnfernandes/broken-link
...
Fixes broken link in docs.
Upstream-commit: c6d550be98555277124299bcc4e825286a949931
Component: engine
2016-07-11 19:43:37 +02:00
44b64e6459
Fixes broken link in docs.
...
Fixes #24428
Signed-off-by: Joao Fernandes <joao.fernandes@docker.com >
Upstream-commit: 6c9b5da5a17adccc06cbee31d1e674f89644030b
Component: engine
2016-07-11 10:20:01 -07:00
113ca78a6b
Use waitAndAssert to test node state changes
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: f02ec39e99bfd36f34a965f78d853e19234e513b
Component: engine
2016-07-11 10:01:14 -07:00
04c06a5318
return err when stack name does not exist
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 416613f2e54581c62d3efa1c4f0288b6e7d58365
Component: engine
2016-07-12 00:59:30 +08:00
e2e3de5c59
Change content-trust doc to not point to images that don't exist #22730
...
Signed-off-by: Mansi Nahar <mmn4185@rit.edu >
Upstream-commit: 82d70f440952951f2ce8aee34f3f750f540aed38
Component: engine
2016-07-11 12:41:03 -04:00
a7e56d2212
Merge pull request #24239 from ardnaxelarak/24130_clean_up_docs
...
[Docs code snippets] Make it obvious what is command what is result
Upstream-commit: c9e739011574f3b3fb0a1f450e69304b6dbdabf6
Component: engine
2016-07-11 08:26:30 -07:00
47121a7e47
Merge pull request #24488 from lchi/master
...
Fix grammar in docker volumes tutorial
Upstream-commit: 8c43c7293b87f2d3dd66744a7ce69bc00b7f7883
Component: engine
2016-07-11 17:16:04 +02:00
6c06986ed1
Fix grammar in docker volumes tutorial
...
Signed-off-by: Lucas Chi <lucas@teacherspayteachers.com >
Upstream-commit: 7b3ac47fa4c2dd6850959c3c230289eefbc4dbe3
Component: engine
2016-07-11 10:34:02 -04:00
737108710c
Merge pull request #24139 from runshenzhu/health-check
...
add health check in docker build-in swarm mode
Upstream-commit: e2fc1439a11cff5f719ae47265da135d26dd36ad
Component: engine
2016-07-11 09:43:59 -04:00
e6318e2a96
Merge pull request #24390 from medallia/deduplicate-volstorage-create
...
Remove code duplication in VolumeStore Create CreateWithRef
Upstream-commit: ed5e6b4e60945b53ec0bfa7cf409eac3ea8ea448
Component: engine
2016-07-11 09:25:11 -04:00
abbe69120e
Remove execution driver
...
We use containerd and there is no execution driver anymore.
Addresses: https://github.com/docker/docker/issues/24461
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 1fb1136fecfd761300a38f64ac9178979cc0b270
Component: engine
2016-07-11 14:52:27 +08:00
cacc475cf4
Merge pull request #24490 from runcom/net-none-tests
...
integration-cli: fix --net=none tests
Upstream-commit: 8f3be176d26948dfac9b6d855034dabae78454be
Component: engine
2016-07-11 11:39:17 +08:00
dd59a5931c
integration-cli: fix --net=none tests
...
Example:
21:28:01 [d68573521] waiting for daemon to start
21:28:01 [d68573521] daemon started
21:28:01 docker_api_swarm_test.go:163:
21:28:01 c.Assert(d1.Init(map[string]bool{"worker": true}, ""),
checker.IsNil)
21:28:01 ... value *errors.errorString =
&errors.errorString{s:"initializing swarm: invalid statuscode 500,
\"{\\\"message\\\":\\\"could not determine local IP address: dial udp
8.8.8.8:53: connect: network is unreachable\\\"}\\n\"} ("initializing
swarm: invalid statuscode 500, \"{\\\"message\\\":\\\"could not
determine local IP address: dial udp 8.8.8.8:53: connect: network is
unreachable\\\"}\\n\"")
21:28:01
21:28:01 [d68573521] exiting daemon"}
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 9fadb8fd6a09c8982dc8a44125f4d21c33c8c394
Component: engine
2016-07-10 15:56:02 +02:00
2768065432
Merge pull request #24468 from yongtang/24374-docker-info-seccomp
...
Fix seccomp output in `docker info`
Upstream-commit: bc5fa7c5e04f776ee5a4636a78b59462463b92ac
Component: engine
2016-07-10 04:22:26 -07:00
eb739e9c8e
Merge pull request #24459 from tonistiigi/update-swarmkit
...
Update swarmkit to 6478bc19cf
Upstream-commit: 602f1c02d9c4d1838ada9e3ad60559defc5f38ca
Component: engine
2016-07-08 23:40:27 -07:00
e6a800a619
Merge pull request #24425 from cpuguy83/add_make_run
...
Add target for `make run`
Upstream-commit: 3ab080a4bd105d630bc1d67808bdc04bc4b4698e
Component: engine
2016-07-08 21:10:19 -04:00
f2aefa4f7f
swarmkit expects network-id for as target
...
For any operation that involves netwoks (other than network create),
swarmkit expects the target as network-id. Service upate was using
network-name as the target and that caused the issue.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: b32cfb32a3f654f27bc9d4356b36c6a7e5e53b21
Component: engine
2016-07-08 18:00:41 -07:00
f711cd5f01
Fix seccomp output in docker info
...
This fix tries to address the issue raised in #24374 where
`docker info` outputs seccomp support in Ubuntu 14.04 but
the seccomp wass not actually supported.
The issue is that in the current docker implementation, seccomp
support is only checked against the kernel by inspect CONFIG_SECCOMP
and CONFIG_SECCOMP_FILTER. However, seccomp might not be enabled
when building docker (through golang build flag).
This fix adds a supportSeccomp boolean variable. The supportSeccomp
is only set to true when seccomp is enabled when building docker.
This fix fixes #24374 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: a3b9dd89a1b19e7f84617b91f3756ae816c11035
Component: engine
2016-07-08 17:26:42 -07:00
727d754fd1
Add more complicated demotion testcases
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: a3f1577365f7b2ed99d1801c909bfaa69c048c92
Component: engine
2016-07-08 13:33:40 -07:00
8d74981897
Add logdrivers to executor from swarmkit
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 8a50315f3ce89b24e3556dba288b2ce7b4daf026
Component: engine
2016-07-08 13:33:40 -07:00
7ac8dc18c4
Update executor volumes from swarmkit
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 6586f4f0719ae59c4a2b74acd91a1a888a0018b5
Component: engine
2016-07-08 13:33:40 -07:00
