Commit Graph

24265 Commits

Author SHA1 Message Date
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
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
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
7aace8a59b Add zsh completion for 'docker service {create,update} --log-{driver,opt}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 45484f5458e3b4cf7996d4cb8481ed7e38982200
Component: engine
2016-07-20 09:18:59 +02:00
a2bd46cb48 Add zsh completion for 'docker node update --label-{add,rm}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: cdb8383d7f4045a5cde0fe636f8fadb6560ba6cd
Component: engine
2016-07-20 09:11:16 +02:00
a5f27f2a75 Merge pull request #24507 from sfsmithcha/doc_node_labels
add ref docs for node label
Upstream-commit: 724c69f060ccf21088843ff00c3a8ba4dd966da8
Component: engine
2016-07-20 00:46:51 +02:00
d263002db2 add ref docs for node label
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 9594ac97ce0c6e0777716be2a35b47208d440e8e
Component: engine
2016-07-19 15:41:00 -07:00
c9d322ff3f Merge pull request #24653 from dongluochen/testrollingupdate
Add integration test for rolling update
Upstream-commit: a9b392014f1ced4af6d3834a5e9f040c2eb6c8c2
Component: engine
2016-07-19 16:51:40 -04:00
4af08896ba Merge pull request #24049 from tophj-ibm/remove-lingering-volume-from-tests
DockerExternalVolumeSuite: add daemon to test
Upstream-commit: f2afd1a9062f47432afe858f9fc3fa5ad221003b
Component: engine
2016-07-19 22:39:39 +02:00
6c22592de6 Test rolling update.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: d327765a62a99dc63e9a8c16ac291861cee066f3
Component: engine
2016-07-19 12:09:30 -07:00
fb96034315 Merge pull request #24801 from anusha-ragunathan/plugin-lookup
Remove extra map lookup for volume drivers.
Upstream-commit: 4498214a2adc16662d3ba1b40139a84412a5ec57
Component: engine
2016-07-19 20:52:39 +02:00
fcffdb424a Merge pull request #24802 from vdemeester/stack-docs-and-flags
Add documentation for stack commands
Upstream-commit: 2ee828aac25495e2ff61d48bd81a5d70d955a06a
Component: engine
2016-07-19 14:30:49 -04:00
257d1bc3de Merge pull request #24648 from mlaventure/fix-kill-test
Fix TestDaemonRestartWithKilledRunningContainer failures on RHEL systems
Upstream-commit: ffba13f43539ff58a0021c9353229507d50b66d5
Component: engine
2016-07-19 18:24:34 +00:00
4fa1dcc683 Merge pull request #23825 from dnephin/auto-gen-man-page
Generate man pages from the Command description
Upstream-commit: ac26ee15df4d0e8f406b69f9179b489aa5126ebb
Component: engine
2016-07-19 18:22:01 +00:00
74d8c449cf Merge pull request #24804 from crosbymichael/rpm-socket
Remove docker.socket from rpm based systems
Upstream-commit: 39327a67e89b88ce60eb6edd2c63b0cf07810993
Component: engine
2016-07-19 11:18:22 -07:00
f139b64ef8 Remove extra map lookup for volume drivers.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 5d4627331ee0c685116b083e9f25f2644f0d1bd0
Component: engine
2016-07-19 09:35:56 -07:00
918c17adbd Add documentation for stack commands
Also removes the `-f` flags of bundle to follow the single-letter flags
evaluation.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 10919e890942cbdaa65f180dbcd475d21b9c6713
Component: engine
2016-07-19 18:32:44 +02:00
02e14246d7 Remove docker.socket from rpm based systems
Fixes #23981

The selinux issue we are seeing in the report is related to the socket
file for docker and nothing else. By removing the socket docker starts
up correctly.

However, there is another motivation for removing socket activation from
docker's systemd files and that is because when you have daemons running
with --restart always whenever you have a host reboot those daemons
will not be started again because the docker daemon is not started by
systemd until a request comes into the docker API.

Leave it for deb based systems because everything is working correctly
for both socket activation and starting normally at boot.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 04104c3a1e6cad30cb41b762e8832215466c0e95
Component: engine
2016-07-19 09:31:43 -07:00
a764e64f97 Dont run man generation as part of test-unit.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 47cca88c8c151ebf3dd25adcf28ac1b2f75c76fb
Component: engine
2016-07-19 12:00:35 -04:00
b77059c741 Set Long text for volume commands so they can be used to generate man pages.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 25e9b06ac0750396f35d3f52f71c44b1072f0972
Component: engine
2016-07-19 12:00:21 -04:00
9ed298d21b Add a script to generate man pages from cobra commands.
Use the generate.sh script instead of md2man directly.
Update Dockerfile for generating man pages.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 00a8a40398263429f99b1a5f0be59048e1c6f38d
Component: engine
2016-07-19 12:00:21 -04:00
ac1b563dd3 Update libcontainerd.AddProcess to accept a context
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: c02f82756e914081543bf05cb1815a48c02b1ebd
Component: engine
2016-07-19 08:24:39 -07:00
32ecbd59e9 Do not rely on "live" event anymore
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 64483c3bdaa1887b8b932e0564362fbbff025dc0
Component: engine
2016-07-19 08:24:39 -07:00
766219b46e Merge pull request #24776 from anusha-ragunathan/plugins-connect
Add only legacy plugins to the legacy lookup map.
Upstream-commit: 6875f71d7c6a01b918fcc372ac2c17c5a0d65418
Component: engine
2016-07-19 17:11:50 +02:00
8bb6df73dc Merge pull request #24722 from thaJeztah/update-usage-for-deprecated-flags
Don't automagically add "[OPTIONS]" to usage
Upstream-commit: 68e52febdee553c2768ac7ea54817e0657d5ce8a
Component: engine
2016-07-19 11:01:33 -04:00
b26a40587b Fix nits in deprecated
Signed-off-by: Harry Zhang <harryz@hyper.sh>
Upstream-commit: 78a5480dfd8dc1b304e38bc9c18854c4ef86de33
Component: engine
2016-07-19 22:42:23 +08:00
91c5d7692b Merge pull request #24791 from albers/completion-node-update-labels
bash completion for `docker node update --label-{add,rm}`
Upstream-commit: be2e2fca089029d1fb0d8dc73e5046cfb1c62bdf
Component: engine
2016-07-19 15:22:29 +02:00