ac007a8e3c
Fix regression on --link on bridge network
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 3a3f800ff48ddfa729f1db7898bf689d25a6d4cf
Component: engine
2016-07-22 18:52:46 -07:00
bfc472f3e3
Merge pull request #24904 from mlaventure/update-dockerfile-containerd-commit
...
Harmonize containerd commit used by all Dockerfile
Upstream-commit: 2b3148c72027ca80dafa612a54eb0f11b1614c20
Component: engine
2016-07-21 23:18:41 +02:00
b77e9f97ce
Merge pull request #24572 from yongtang/24534-deprecation-cycle-3-releases
...
Extend deprecation cycle to 3 releases by default
Upstream-commit: 8cbe6541b2229357370e61ce6fb35d131be93cac
Component: engine
2016-07-21 21:06:57 +02:00
c363072451
Merge pull request #24874 from abronan/update_libkv
...
Vendoring libkv @v0.2.1
Upstream-commit: 8a19c13d32da5c92509a9c7b75f68af048c44495
Component: engine
2016-07-21 14:28:01 -04:00
281fb0ce0f
Merge pull request #24846 from michael-holzheu/24748-s390x-update-jessie-glibc
...
Dockerfile.s390x: Update glibc to proposed-updates 2.19-18+deb8u5
Upstream-commit: c435045c305a390d05cd9cebebb7a01a28464156
Component: engine
2016-07-21 19:44:54 +02:00
de47d59158
Harmonize containerd commit used by all Dockerfile
...
When #24648 was merged, only the main Dockerfile was updated with the
new containerd commit, this commit brings the other Dockerfile up to
speed.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: d5cbc57eff0df651bfbfb455608da45747651d0c
Component: engine
2016-07-21 10:34:30 -07:00
108637a2eb
Dockerfile.s390x: Update glibc to proposed-updates 2.19-18+deb8u5
...
The glibc of Debian Jessie contains the following two bugs:
https://sourceware.org/git/?p=glibc.git;a=commit;h=890b7a4b33d482b5c768ab47d70758b80227e9bc
https://sourceware.org/git/?p=glibc.git;a=commit;h=2e807f29595eb5b1e5d0decc6e356a3562ecc58e
The CI tests hang because the bugs affect the gccgo runtime of the
s390x/gcc images.
Now the fixes have been integrated to glibc 2.19-18+deb8u5 in
"proposed-updates" for Debian Jessie:
https://anonscm.debian.org/cgit/pkg-glibc/glibc.git/log/?h=jessie
https://release.debian.org/proposed-updates/stable.html
It is expected that the package should be part of the next stable point
release (8.6) in about one to two months from now.
In order to enable CI for s390x earlier, we now explicitely update
the glibc in Dockerfile.s390x to the proposed-updates version.
After Debian 8.6 is released we can remove this change again.
Closes #24748
Suggested-by: Tianon Gravi <admwiggin@gmail.com >
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com >
Upstream-commit: 81dc97902264fe77877d32e42fdb8a57f123c2b3
Component: engine
2016-07-21 08:48:43 -04:00
bf34d0960f
Merge pull request #24892 from thaJeztah/fix-label-formatting-example
...
docs: improve formatting and highlighting of docker ps reference
Upstream-commit: 2debfe84354d306236b576a0fde665f9af5e0994
Component: engine
2016-07-21 12:38:45 +02:00
5614c24f22
Merge pull request #24700 from nishanttotla/pass-registry-auth-on-deploy
...
Send registry auth token for service deploy
Upstream-commit: 22d020276cfd6df3482523bc680c775d6a0c57ca
Component: engine
2016-07-21 12:33:33 +02:00
5dc34c3c66
docs: improve formatting and highlighting of docker ps reference
...
this improves the formatting, and code-highlighting
of the `docker ps` reference page, and wraps sentences
to 80 chars
also adds single quotes around the formatting
example for labels.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 07ef0a37f85fbb3ba0be4a09bb301108bf461d96
Component: engine
2016-07-21 12:27:39 +02:00
5e5e1a3d76
Merge pull request #24884 from Microsoft/jjh/TestBuildWorkdirWindowsPath
...
Windows: TestBuildWorkdirWindowsPath hard code fix
Upstream-commit: bdf4d9c1cd5fc6f91cb5ea831dfbe62870b4ab18
Component: engine
2016-07-21 11:42:26 +02:00
cc9d201773
Clarify API behavior when older versions are called.
...
Signed-off-by: fonglh <fonglh@gmail.com >
Upstream-commit: f62e24f697dd5c69e58f3b5d732fd5a962a0c8e6
Component: engine
2016-07-21 16:16:46 +08:00
cb69fb7ef6
Merge pull request #24870 from stevvooe/volume-opt
...
api/client/service: shorten to volume-opt
Upstream-commit: 31b3357c060156b51f1f0764e49a21e9089332e5
Component: engine
2016-07-21 09:36:06 +02:00
8be16788f7
Merge pull request #24861 from albers/completion-network-driver-macvlan
...
Add explicit support for macvlan networks to bash completion
Upstream-commit: d458abca4e37eb791e6e2efd00c6e0511c495669
Component: engine
2016-07-21 09:22:35 +02:00
9ef04f92b8
Windows: TestBuildWorkdirWindowsPath hard code fix
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: ceed93a874bf74baf811ed7fe9a476f25adca7b8
Component: engine
2016-07-20 21:23:38 -07:00
1cef852614
update libkv, fix wrong error check on zookeeper list
...
Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com >
Upstream-commit: 5189e3d50d66c654132a64777e437dad55176ed5
Component: engine
2016-07-20 17:25:39 -07:00
c6f6695f3d
Merge pull request #24866 from thaJeztah/fix-sloppy-copy-pasta
...
docs: fix copy/pasta error
Upstream-commit: ccd0d83344da3b4c67708465f11aa542601b6407
Component: engine
2016-07-21 02:02:28 +02:00
3087bde702
api/client/service: shorten to volume-opt
...
`volume-driver-opt` was too verbose for its own existence and the sanity
of those in the vicinity. The much better, sleeker `volume-opt` replaces
it. 7 bytes and a case of carpal tunnel syndrome are saved!
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: a40b5820c91640183b40e0668f6802415e6adc14
Component: engine
2016-07-20 16:08:36 -07:00
2332ccb8c3
Send registry auth token for service deploy
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: a26bdd8607c62e6e736d06e9ec8f0908c4808d74
Component: engine
2016-07-20 16:07:07 -07:00
0938c99ecd
Merge pull request #24563 from dperny/test-leader-election
...
Added leader election test
Upstream-commit: ea59668046e1c842b311732fc280701da1056ace
Component: engine
2016-07-20 16:02:09 -07:00
0d2e409cad
Merge pull request #24842 from thaJeztah/fix-code-highlight
...
docs: add code-hints to builder page
Upstream-commit: 8c6c1aaf07277ea09f65d79337152ba0c9833d4c
Component: engine
2016-07-21 00:06:52 +02:00
1af7b06c9a
docs: fix copy/pasta error
...
Looks like I copied from the line below, not
from the output :)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 83b12c0c1144dc3778177fab8dc5052108388f1e
Component: engine
2016-07-20 23:59:38 +02:00
41aabc22f9
Merge pull request #24838 from thaJeztah/add-log-options-to-docs
...
Add missing --log-driver and --log-opt docs
Upstream-commit: eefc17bba10c90abfc05b26a457f99e30e9b4312
Component: engine
2016-07-20 23:50:10 +02:00
25518e4d02
Merge pull request #24864 from thaJeztah/update-plugin-docs
...
docs: update reference docs for plugins
Upstream-commit: 15ad5b5d09200bd8711e6bcd5ba9c486ba5ab8dc
Component: engine
2016-07-20 23:48:26 +02:00
c39d6f825c
docs: update reference docs for plugins
...
the output/response slightly changed in
340964db1c8f161a2ad156023eb47dcc93bf804b,
and `:latest` is no longer required for
various actions.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 9d532b5e2d4e68888e38ad2793d9075815e230f7
Component: engine
2016-07-20 23:37:55 +02:00
5da22e7bcc
Merge pull request #24853 from Microsoft/jjh/nanoserver
...
Windows: Allow nanoserver image for CLI
Upstream-commit: 4b7a83dbce9d804ac77074dd4d4a1d582334b63c
Component: engine
2016-07-20 22:50:08 +02:00
700598ff90
Add manual support for macvlan networks to bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 6c98d5bfaccda4b211e537f5072767160a20d497
Component: engine
2016-07-20 13:13:14 -07:00
dc6f7a802b
Merge pull request #24820 from sfsmithcha/add_how_swarm_works_guide
...
add how nodes work to how swarm works guide
Upstream-commit: 81ef36c98045f86d21533a9414fe192a1656febb
Component: engine
2016-07-20 22:08:31 +02:00
0c46ea7d1c
Merge pull request #24859 from albers/completion-syslog-driver-options
...
Update completions for syslog log driver options
Upstream-commit: 053a4b844a2ac2513c387ae91d1f17c2de58a07b
Component: engine
2016-07-20 15:47:48 -04:00
35fe893e6d
Merge pull request #24024 from AkihiroSuda/buildcache2
...
mount .go-pkg-cache for DOCKER_INCREMENTAL_BINARY
Upstream-commit: eddb3a20208dc0f1dccbf7e8b411bfa46ef653d0
Component: engine
2016-07-20 15:37:39 -04:00
4795963168
add how nodes work to how swarm works guide
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 137261f97ce3f27a8c28a50e286429ead4a6fc18
Component: engine
2016-07-20 12:37:38 -07:00
ce6757e883
Update completions for syslog log driver options
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 492fdf1f57bff10bed5d44bf63f344c1d7961eb2
Component: engine
2016-07-20 12:35:04 -07:00
7fe7aaea87
Merge pull request #24620 from yongtang/24270-service-list-filter
...
Allow partial name match for service ls --filter, node ls --filter, node tasks --filter
Upstream-commit: 7d84c715005dd123b0a63f23b207c12cb998786f
Component: engine
2016-07-20 21:25:06 +02:00
3210cf6941
Merge pull request #24523 from sfsmithcha/clarify_rolling_update
...
clarify update-delay and rolling update behavior
Upstream-commit: a9ca19feaa5280f3f13eeab9fa14b26cb5ef3d6b
Component: engine
2016-07-20 20:24:18 +02:00
a918797c41
clarify update-delay and rolling update behavior
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 68a9224bd42437e63972dc9c3374c065872363b3
Component: engine
2016-07-20 10:11:04 -07:00
34fed514cd
Windows: Allow nanoserver image for CLI
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 624e6cdbf386d0862e882db9e35d2c7caaa1b337
Component: engine
2016-07-20 09:59:52 -07:00
066ad77538
docs: add initial reference for "stack services"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f49dc528ed29e6285c24ef356652cc8bc637c8c7
Component: engine
2016-07-20 18:56:49 +02:00
9e5ae213df
Merge pull request #24266 from allencloud/add_cmd_docker_stack_services_STACKNAME
...
add command `docker stack services STACKNAME`
Upstream-commit: 2a78789ad1e5a980a6822d90d7a5039ac7af1252
Component: engine
2016-07-20 18:38:08 +02:00
00ad3eae23
Merge pull request #24841 from thaJeztah/rename-bundle-flag
...
[RFC] Rename --bundle to --file
Upstream-commit: b9c49598825529a165e2fead7eae70c3442af7ba
Component: engine
2016-07-20 15:50:54 +00:00
095e5689c4
Vendor swarmkit to 9ee5fc3b8db5de8c8593a57bc45fc178f74ceee1
...
This commit update swarmkit to 9ee5fc3b8db5de8c8593a57bc45fc178f74ceee1.
This is part of step to fix #24270 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 467107cd401ce9d3678e4f7ec1abfb65a0e46018
Component: engine
2016-07-20 08:16:54 -07:00
a996d4618b
Allow partial name match for node ls, and node tasks
...
This fix is an extension to last commit to expand the partial
filter to node and task searches.
Additional integration tests have been added to cover the changes.
This fix fixes 24270.
This fix fixes 24112.
Note: A separate pull request will be opened on swarmkit.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: e734fa58eadb4dfaa33b4be275d6f8f29d899e78
Component: engine
2016-07-20 08:16:10 -07:00
4e5748b717
Merge pull request #24843 from resouer/fix-nits
...
Fix nits in deprecated
Upstream-commit: d6d02f652c23770fb6b605e8ece44a3d2334ccc1
Component: engine
2016-07-20 16:32:47 +02:00
304d95b4ec
docs: add code-hints to builder page
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: b5503ef0a511f5be11d9dcfa1359976f159d8a67
Component: engine
2016-07-20 16:18:44 +02:00
76dae42c92
Rename --bundle to --file
...
This renames the '--bundle' flag for docker (stack) deploy
to be consistent with 'docker build'.
Note that there's no shorthand '-f' added for now,
because this may be confusing on 'docker stack config',
which also takes a file, and for which we may want to
have a '--format' flag in future.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 06f35262c47629fef78e36daaa2742c2c0d7c3a9
Component: engine
2016-07-20 16:03:27 +02:00
b84c583f35
fix duplicated usage in docs
...
this removes a copy/pasta whoopsie on my side,
introduced in de64324109d2694b1525e62b5c0072267282a36c
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: effbd2b76decd00444d963e10eabe2766bb8c89c
Component: engine
2016-07-20 15:36:02 +02:00
b7425fb465
Add missing --log-driver and --log-opt docs
...
Adds documentation for "--log-driver" and "--log-opt"
for services.
Also updated the API docs to include the new
options, and generated a more complete JSON
example.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 5ece2a6e0d748fe3960a7459b745ceb4302e9202
Component: engine
2016-07-20 14:55:26 +02:00
f9814c5993
Merge pull request #24832 from npcode/fix-service-rm-usage
...
Fix the usage for `service rm` command
Upstream-commit: 3d4bde92b72c963a01419c4827909e355b44e6f2
Component: engine
2016-07-20 06:44:34 -04:00
708fdf6b4a
Merge pull request #24828 from sdurrheimer/zsh-completion-node-update-label-add-rm
...
Add zsh completion for 'docker node update --label-{add,rm}'
Upstream-commit: 5527763f8cedbf5b23fe9063f30e9ed0b8d06f4c
Component: engine
2016-07-20 11:47:03 +02:00
a90f40fdaf
Fix the usage for service rm command
...
Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com >
Upstream-commit: cf61cd3a920809f6a0be44a584f365544acaf1a9
Component: engine
2016-07-20 18:27:26 +09:00
592a15f46b
mount .go-pkg-cache for DOCKER_INCREMENTAL_BINARY
...
The cache was not used when we run `make binary` from the host.
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 389d5cde7b5474cd33d251aadc96be1f0bdbc711
Component: engine
2016-07-20 08:20:38 +00:00
