Commit Graph
36884 Commits
Author SHA1 Message Date
Aaron Lehmann 6eff6aab71 cluster: Refuse swarm spec not named "default"
If, using the API, a user submits an init request with a spec that has a
name other than "default", the engine will rename the "default" cluster
object. Some parts of swarmkit depend on having a cluster object named
"default". Reject any specs that use other names.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 9dba9e3248f8476d15242ce3ec0bf6d6d50c1a76
Component: engine
2016-11-28 17:19:29 -08:00
Anusha Ragunathan fbf2916db8 On plugin pull errors, delete created dirs.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 9e4234261c3e4d13f98218a97d7cc6644723e310
Component: engine
2016-11-28 16:57:27 -08:00
Dong Chen 0e6be54ce9 Fix network attachable option.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: abcb699ad175859ee192388c001f55df5f88e8cd
Component: engine
2016-11-28 16:54:56 -08:00
Sebastiaan van Stijn 1657094e13 Merge pull request #28906 from mstanleyjones/udp_port_publishing
Document publishing a UDP port
Upstream-commit: 66154d08882339f7be244da963b2adaae49ed556
Component: engine
2016-11-29 00:57:41 +01:00
Brian Goff aeaa16bae6 Merge pull request #28898 from vdemeester/fix-imagelist-retrocompat
Fixes ImageList to be retro-compatible with older API
Upstream-commit: 0b04f1dca23c9996ad240361ce0f59f1a96f78c6
Component: engine
2016-11-28 18:57:13 -05:00
John Howard 4c2dcd5ab3 WORKDIR set cmd
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 1b97bb416b8e2d4cd77544a1d714026b25d73c2f
Component: engine
2016-11-28 15:44:10 -08:00
Josh Hawn fc0f081a42 Reject unspecified advertise addr on swarm init
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: eeac8719466dbc42de7a9919d4f549863944aa19
Component: engine
2016-11-28 15:44:06 -08:00
Misty Stanley-Jones d5ad036021 Document publishing a UDP port
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 2178c840ba420d7d207aedae292e2e70d7198265
Component: engine
2016-11-28 15:41:56 -08:00
Tibor Vass f10f66cfd3 Merge pull request #28897 from anusha-ragunathan/plugin_exit
Fix issue with plugin exit.
Upstream-commit: 584d23d8494ed07e5eb9684297eefc065ae7fedd
Component: engine
2016-11-28 15:25:27 -08:00
Daniel Nephin e387834219 Use namespace label on stack volumes.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 798c4a614e
Component: cli
2016-11-28 18:02:39 -05:00
Daniel Nephin 2ae9ad9ad5 Use namespace label on stack volumes.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4013a7c6d897051bb79982230f31279ee0c9a026
Component: engine
2016-11-28 18:02:39 -05:00
Victor Vieux f50e05e729 Merge pull request #28901 from thaJeztah/carry-28783-update-plugin-example
[carry 28783] update plugin example
Upstream-commit: 13ce1fe5a9aa3ace04880d31a4e9a2b038a0970c
Component: engine
2016-11-28 14:45:47 -08:00
Victor Vieux ee131d47d1 update plugin example
Signed-off-by: Victor Vieux <victorvieux@gmail.com>

cleanup whitespace formatting

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d73f73b3654add36096def93f5736cc6a6686226
Component: engine
2016-11-28 23:44:24 +01:00
Brian Goff 312027d8f9 Merge pull request #28776 from Microsoft/jjh/fix28775
Align output of docker version again
Upstream-commit: 8c2e674551fdcf7f8bd7514853e69e7363b28f56
Component: engine
2016-11-28 17:02:17 -05:00
Aaron Lehmann 4d8affc167 Don't resolve or pull images referenced by ID
If a swarm service is created using an image ID, it's useless to try to
pull this reference or resolve it to a manifest digest. Avoid doing this
when a fully qualified image ID is given.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 089842c4b47c262187b0b1a8d6d124f3faa03752
Component: engine
2016-11-28 13:53:52 -08:00
Vincent Demeester 90f36d5983 Fixes ImageList to be retro-compatible with older API
Make sure current client code can talk for ImageList can still talk to
older daemon.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 32f410cd35
Component: cli
2016-11-28 22:15:50 +01:00
Vincent Demeester f4c6d41e59 Fixes ImageList to be retro-compatible with older API
Make sure current client code can talk for ImageList can still talk to
older daemon.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: c6e31454ba2f053bc6831651663cf538d142afaa
Component: engine
2016-11-28 22:15:50 +01:00
Anusha Ragunathan c7fce8b04c Fix issue with plugin exit.
A plugin has an `ExitChan` channel which is used to signal the exit of
the plugin process. In a recent change, the initialization was
incorrectly moved to the daemon Shutdown path.

Fix this by initializing the channel during plugin enable.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 890a98ceed982454515f5b089d9772fc1e4eb6e0
Component: engine
2016-11-28 12:48:56 -08:00
Yong Tang c06179cb55 Fix issue caused by duplicate docker plugin create with same names
This fix tries to fix the issue raised in 28684:
1. Duplicate plugin create with the same name will override the old plugin reference
2. In case an error happens in the middle of the plugin creation, plugin directories
   in `/var/lib/docker/plugins` are not cleaned up.

This fix update the plugin store so that `Add()` will return an error if a plugin
with the same name already exist.

This fix also will clean up the directory in `/var/lib/docker/plugins` in case
an error happens in the middle of the plugin creation.

This fix fixes 28684.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 662d456928e47162a3af5931356cb05b6a3f9918
Component: engine
2016-11-28 12:37:49 -08:00
Vincent Demeester b27f0b5dc5 Merge pull request #28734 from ipbabble/master
Added and example of using --format with docker images
Upstream-commit: 60e72ea379ba0b8308f7bdec19ddfc8649402116
Component: engine
2016-11-28 20:57:13 +01:00
John Howard 6ff3c5f368 Align output of docker version again
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: a913891b7d
Component: cli
2016-11-28 11:38:58 -08:00
John Howard 52fcb6e953 Align output of docker version again
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: dfeaf7a959cf619f5460c88e7bc1fe5ce40d50a7
Component: engine
2016-11-28 11:38:58 -08:00
Vincent Demeester 9bddcd96ba Merge pull request #28792 from yuexiao-wang/restart-mgr
Optimize the unit test for restartmanager
Upstream-commit: 3ccc4bc370cf48eeb89d5de74b3b175da8785700
Component: engine
2016-11-28 20:27:44 +01:00
John Howard b1f04046d7 Windows: Note about volumes in run
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b9e65f40cfce3eb1907ad9d8a358c6ae1ad64175
Component: engine
2016-11-28 11:06:01 -08:00
Sebastiaan van Stijn f17239930f Merge pull request #28891 from mstanleyjones/fix_doubled_words
Fix instances of doubled words
Upstream-commit: 0e0a5e0d391c0d231cebcdfac619df39f0e52e04
Component: engine
2016-11-28 19:57:17 +01:00
Sebastiaan van Stijn ca44db086c Merge pull request #28890 from mstanleyjones/fix_is-official
Fix copypaste error 'is-automated'
Upstream-commit: 1a710b15856f8c3bbab035fb64cf0669787fe359
Component: engine
2016-11-28 19:53:02 +01:00
Misty Stanley-Jones 66e7509ec9 Fix instances of doubled words
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 379e9259cf407f6f97ba31f1ddb921256613cee3
Component: engine
2016-11-28 10:48:45 -08:00
Misty Stanley-Jones 3a792f1aec Fix copypaste error 'is-automated'
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 2333657e1b20d6a482627b78c9333cdf34397ff5
Component: engine
2016-11-28 10:31:38 -08:00
John Howard f53ec9c3d1 Windows: Builder case insensitive env
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 49f392ff6b528d571eac538f5365bd51c4c83e5c
Component: engine
2016-11-28 10:30:45 -08:00
David Lawrence 2345e8bf51 updating notary to released 0.5.0 version
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
Upstream-commit: 175792a65563b6ee14d049631d46749cd4165a3c
Component: engine
2016-11-28 10:29:17 -08:00
Doug Davis ae5687c23e Merge pull request #28514 from Microsoft/jjh/workdir
Refix COPY file . after WORKDIR (now always created)
Upstream-commit: 937027a0cbaf256ca32664d8d64d1c8eda16eaa6
Component: engine
2016-11-28 12:58:17 -05:00
Sebastiaan van Stijn 550446de25 Merge pull request #28886 from mstanleyjones/fix_redirect_loop
Fix some redirect loops and problems
Upstream-commit: 35fd96f3f9b46eaf062d8035e1d4d5b1e28c4ebf
Component: engine
2016-11-28 18:49:36 +01:00
Misty Stanley-Jones 5d16bd52ab Fix some redirect loops and problems
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: a1f55dca21c4ee9f38ed2aeba535cdba3bb2f790
Component: engine
2016-11-28 09:46:38 -08:00
Vincent Demeester 668bff0dea Revert "Add -a option to service/node ps"
This reverts commit 139fff2bf0ebe12b61871ba8ec8be8d51c2338db.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 6ffb62368a
Component: cli
2016-11-28 18:08:45 +01:00
Vincent Demeester 871ee3d12b Revert "Add -a option to service/node ps"
This reverts commit 139fff2bf0ebe12b61871ba8ec8be8d51c2338db.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: eb55d03f3c321e31c8da993233b2679f47d5b4e1
Component: engine
2016-11-28 18:08:45 +01:00
Kenfe-Mickaël Laventure 283a98479d Merge pull request #28625 from albers/completion-plugins
Add bash completion for plugin API
Upstream-commit: 783d4ac6d40b48f40e752561c79e777b35c2c0a9
Component: engine
2016-11-28 08:56:53 -08:00
Vincent Demeester 21bda2fa99 Merge pull request #28822 from yuexiao-wang/modify-plugin
Modify repoName to PLUGIN for docker plugin create
Upstream-commit: a0ce75c25d
Component: cli
2016-11-28 17:52:04 +01:00
Vincent Demeester 526d1ca139 Merge pull request #28822 from yuexiao-wang/modify-plugin
Modify repoName to PLUGIN for docker plugin create
Upstream-commit: b20bf510e5ba26320c7f8ff827040b948a9225cd
Component: engine
2016-11-28 17:52:04 +01:00
Vincent Demeester 9504c186db Merge pull request #28877 from vdemeester/dont-export-accepted-filter
AcceptedFilters in router/network/filter.go should not be exported
Upstream-commit: 56a979801a9405aaa19199687b3cacae46f10af3
Component: engine
2016-11-28 17:40:15 +01:00
Vincent Demeester 535a0c8419 stack deploy: handle external network when deploying
If the network is marked as external, don't use the namespace on
it. Otherwise, it's not found.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 8e63000bf3
Component: cli
2016-11-28 17:38:41 +01:00
Vincent Demeester 37ea301199 stack deploy: handle external network when deploying
If the network is marked as external, don't use the namespace on
it. Otherwise, it's not found.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 6fff8454099092780655e8a2c7d71402ce547c5c
Component: engine
2016-11-28 17:38:41 +01:00
Sebastiaan van Stijn 4118c22bb4 Merge pull request #28657 from erxian/fix-doc-about-service-create
fix doc about service create in docker_remote_api_v1.24.md
Upstream-commit: 85a99c88913a104a5793294ed18e739f423d9dfa
Component: engine
2016-11-28 16:06:50 +01:00
Antonio Murdaca 87758bef94 Merge pull request #28882 from vdemeester/remove-stack_config-doc
Remove docker stack config commandline reference doc
Upstream-commit: 76459076c206165cc51eff4efb7077d2e555c026
Component: engine
2016-11-28 15:34:29 +01:00
Sebastiaan van Stijn 133f4e5f14 Merge pull request #28865 from albers/docs-stack-ls-aliases
Add aliases and options to `docker stack ls` docs
Upstream-commit: c04cf54d4eb96adb7a8b32dd2d9259f8a37f4025
Component: engine
2016-11-28 15:27:35 +01:00
Vincent Demeester 259c9695f0 Remove docker stack config commandline reference doc
`docker stack config` command does not exists anymore, removing it
from the command reference documentation.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 3f98871a19eafbfa8ec7da3640d7006d0ca458ef
Component: engine
2016-11-28 15:25:52 +01:00
Vincent Demeester 50f0cb2e24 AcceptedFilters in router/network/filter.go should not be exported
It's not used elsewhere and doesn't need to be exported.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: e517d7975eb7e4dec8326b181e5fcc81b7871575
Component: engine
2016-11-28 14:14:50 +01:00
Justin Cormack ada2a2f91a Merge pull request #28868 from ohmk/fix-a-description-of-docker-swarm-init
fix description of 'docker swarm init'
Upstream-commit: 33b6ef02cb55d3ee650e0a1bba2caa7244c0cf8e
Component: engine
2016-11-28 04:11:31 -08:00
Cyprian Gracz 796e3c3730 Stop returns 0 when docker service was not running
In case when docker was not running init script stop was returning value <> 0.
Due to this fact it was impossible to uninstall the docker-engine if the docker service was stopped.

Signed-off-by: Cyprian Gracz <cyprian.gracz@micro-jumbo.eu>

Fixed message logging

Signed-off-by: Cyprian Gracz <cyprian.gracz@micro-jumbo.eu>
Upstream-commit: 74cf6157ef0d8788a56aed65a85b722ccb50e398
Component: engine
2016-11-28 12:27:21 +01:00
Ben Firshman b852c07238 Make swagger.yaml operationIds consistent
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: bf6a790f00ab96bb8857e3c73502909ee5e36217
Component: engine
2016-11-28 11:24:26 +00:00
Ben Firshman 5d08ec3b42 Make docs URLs in swagger.yaml absolute
This makes the swagger.yaml useful outside of the documentation.
For background:
https://github.com/docker/docker.github.io/pull/606#issuecomment-261389645

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 54051b18a1d65d67de4cb796350e8924936b6a20
Component: engine
2016-11-28 11:24:26 +00:00