f08872faee
Merge pull request #24525 from vdemeester/24196-remove-command-flag-on-service-update
...
Remove --command flag for service update
Upstream-commit: 58624acf11405c482ff0abbc9674cd5441ccce57
Component: engine
2016-07-13 16:01:11 +00:00
1348489290
Remove --command flag for service update
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: e4a024d5902df1d3db8b9fff8865304afa2305e6
Component: engine
2016-07-13 16:19:21 +02:00
43a676799e
Merge pull request #24573 from aboch/chkf
...
Vendoring libnetwork 905d374 and other fix
Upstream-commit: ee981bcc73f3089627e734f983c6685dc5040b1b
Component: engine
2016-07-13 16:15:59 +02:00
891b2576ba
Merge pull request #24562 from thaJeztah/carry-24499-swarm-info-consistency
...
[carry 24499] Remove "Yes"/"No" and use "true"/"false" consistently in `docker info`
Upstream-commit: 92b15778712ff2eb85bf5b7e00fb4fe4310fd6b1
Component: engine
2016-07-13 15:13:58 +02:00
345782c0fa
Merge pull request #24583 from albers/completion-run--network
...
Change bash completion for `docker run --net*` to `--network*`
Upstream-commit: a9a8d807f09014162d63503a5d36a42f6d64b796
Component: engine
2016-07-13 12:46:58 +02:00
0a5f2230dd
Change bash completion for docker run --net* to --network*
...
Ref: https://github.com/docker/docker/pull/23324
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: c4846f697271d2990cca8481338f4827b2558112
Component: engine
2016-07-13 12:42:33 +02:00
3c899b8740
Merge pull request #24301 from coolljt0725/add_dummy_to_check_config
...
Add IPVLAN and DUMMY to check-config.sh
Upstream-commit: 5d11a7987b2987921e436d88dd57ead07a64b030
Component: engine
2016-07-13 12:38:27 +02:00
6e8f820ea2
Merge pull request #24581 from albers/completion-service--endpoint-mode
...
Update bash completion for `docker service {create,update} {--mode,--…
Upstream-commit: ae1a809c39c72d50554740e42bb1a4af3a9dbfb1
Component: engine
2016-07-13 09:52:52 +00:00
70db2efccc
Update bash completion for docker service {create,update} {--mode,--endpoint-mode}
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: a394490d3895fe0122b44a3f89acc04946b83bda
Component: engine
2016-07-13 11:37:31 +02:00
97f6147543
bash completion for docker service {create,update} --registry-auth
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: a44e71c4274cd311e99722277cb674b2bc84d86e
Component: engine
2016-07-13 11:20:02 +02:00
3af50e048c
Merge pull request #24560 from thaJeztah/remove-execution-driver
...
docs: remove executiondriver from API 1.24 docs
Upstream-commit: 9d236d88b78b02ff11f76043522525a9d35e6372
Component: engine
2016-07-13 10:43:13 +02:00
5bac2725f4
Handle ingress sbox creation gracefully
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: ed6641ad61d6d4f6475062ab2a2669a379caf574
Component: engine
2016-07-12 21:51:44 -07:00
04f3b7aca4
Vendoring libnetwork 905d374
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: cabc5b27c0d93a7665a24d205572a9462bb85da6
Component: engine
2016-07-12 21:51:11 -07:00
70c6954131
Merge pull request #24570 from tiborvass/buildid-docker-proxy
...
docker-proxy: Force external linking to add BuildID information to pl…
Upstream-commit: f9383c652cecf559756ec06564bd1b057ad92f33
Component: engine
2016-07-12 20:23:30 -07:00
f883bd35d2
docker-proxy: Force external linking to add BuildID information to please rpm
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 9a690d3544563bf3b88708dabd5bc853e0e749d2
Component: engine
2016-07-12 19:59:48 -07:00
7d87c527de
Merge pull request #24566 from meichuntao/master
...
fix the docker run --readonly example. rename '/icanwrite here' to '/…
Upstream-commit: 489adc96b84ed55bfef0abcb654991620be5510f
Component: engine
2016-07-13 02:49:52 +02:00
9166d8ca38
Merge pull request #24556 from thaJeztah/tabz-tabz-tabz
...
use tabs for indentation
Upstream-commit: dd05a2c0be929b634a00cb50f10f94c59f0190bd
Component: engine
2016-07-12 20:47:28 -04:00
f16f188274
fix the docker run --readonly example. rename '/icanwrite here' to '/icanwrite/here'
...
Signed-off-by: Mei ChunTao <mei.chuntao@zte.com.cn >
Upstream-commit: acbe38a3ccb85be012d88f3109b688f8b815daaf
Component: engine
2016-07-13 08:21:26 +08:00
937633217f
Make labels human readable
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: ea365e4cb37d037046364773d01a744b1258ce4e
Component: engine
2016-07-13 01:08:54 +02:00
d3149bd51e
Merge pull request #24558 from clnperez/systemd-hack-redo
...
Uncomment the TasksMax val later in the deb build
Upstream-commit: 8a405461b0efc16d712770ea9ce48dff4703a7d0
Component: engine
2016-07-12 16:06:44 -07:00
b912567a85
docs: remove executiondriver from API 1.24 docs
...
the executiondriver property was removed in
880484992c360881dc57a3317b84d75300c358af, but docs
were only updated for the 1.25 API, not for 1.24
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 3c6ef4c29d28e92ea29816d6117412162d829c60
Component: engine
2016-07-13 00:49:29 +02:00
231ed0ed4e
Merge pull request #23324 from icecrime/add_run_network
...
Add run network
Upstream-commit: 778b38cbf1f03d54ef86ba79882af45d653e71b0
Component: engine
2016-07-12 14:59:48 -07:00
cbbd824f10
Merge pull request #24548 from cpuguy83/24167_fix_log_config_merge
...
Fix panic while merging log configs to nil map
Upstream-commit: 7a1442baf6e31b3c94a2e9fd92155a75c1987868
Component: engine
2016-07-12 23:40:47 +02:00
bc85e9b069
Uncomment the TasksMax val later in the deb build
...
The original sed placement was creating packages with an
"unsupported" tag in the package name.
Fixes #24197
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com >
Upstream-commit: dab287819a21ef8755d2f1b578ebeea33eb4e784
Component: engine
2016-07-12 16:30:31 -05:00
b9f07879e0
use tabs for indentation
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: fa077f74969b2c11f1ccfb4c5777c98b5e123013
Component: engine
2016-07-12 23:16:55 +02:00
83f818387f
Merge pull request #24549 from cpuguy83/fix_nil_meminfo
...
Fix panic when meminfo couldn't be read
Upstream-commit: 534c3e328fa14cee9b012b18faa35fd1571703ef
Component: engine
2016-07-12 23:05:27 +02:00
3abfcc9b91
Merge pull request #24546 from mavenugo/stend
...
Fixing a stale endpoint issue that blocks ingress network cleanup
Upstream-commit: 933584f16fbd8fa1ffef691ed8d1673e7c896781
Component: engine
2016-07-12 16:40:19 -04:00
6e41fcca17
Merge pull request #24550 from thaJeztah/fix-evil-links
...
Fix some broken sourceforge.net links
Upstream-commit: e794fe2750545be6aee237b189e50a0e66c3d81e
Component: engine
2016-07-12 22:25:19 +02:00
1a5d7b10d7
Merge pull request #24552 from thaJeztah/add-none-join-mode
...
Add "auto-accept=none" to documentation
Upstream-commit: d0b495f6b12fb02fd0742252d4ff90d7b02e523d
Component: engine
2016-07-12 22:21:23 +02:00
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
be4ee8451b
Add "auto-accept=none" to documentation
...
The "none" option was not added to the documentation.
This adds an example, and adds additional information
on manually accepting or rejecting a node.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 06517753c19262129202b224a35965a2686e49e9
Component: engine
2016-07-12 22:06:01 +02: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
a4c4731dc9
Rename --net to --network
...
Add a `--network` flag which replaces `--net` without deprecating it
yet. The `--net` flag remains hidden and supported.
Add a `--network-alias` flag which replaces `--net-alias` without deprecating
it yet. The `--net-alias` flag remains hidden and supported.
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
Upstream-commit: c0c7d5e71586ec8e4d54aef9e061f061e9223cc4
Component: engine
2016-07-12 13:01:35 -07:00
2fa3ccc004
Fix some broken sourceforge.net links
...
Looks like there's issues with sourceforge project
pages. Given that sourceforge isn't really what
it used to be, trying to find alternative URLs
where possible.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 0e7a1079be5e87aae2abcda7c27a2b0e67270a50
Component: engine
2016-07-12 21:51:14 +02:00
b8f5ee5430
Fix panic when meminfo couldn't be read
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 5f7b1b604c9e44477aee196b17fb4b5692cbbaa6
Component: engine
2016-07-12 15:30:21 -04:00
f1f9d4454d
Fix panic while merging log configs to nil map
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 7dff31064824ed1f9b046fe5c29bd707e663ee0b
Component: engine
2016-07-12 15:24:42 -04: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
f8f17ee022
Organize run flags into categories
...
Flatten the list of `docker run` flags and group them loosely by
category (general purpose, security, networking, ...).
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
Upstream-commit: 5b21c8a40823edf82b3b3f22c559c524a49d25a9
Component: engine
2016-07-12 11:35:41 -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
e096d83b0e
Fixing a stale endpoint issue that blocks ingress network cleanup
...
fixes #24400
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: a4926a4d92eb7940d079de01d7fafe43060fcd56
Component: engine
2016-07-12 11:27:58 -07:00
37b231e040
Vendoring libnetwork
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 92c40f9bc0cd08dd8f8aaee6dd889b955a00dc60
Component: engine
2016-07-12 11:27:32 -07: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
