db7f1cc524
Merge pull request #24128 from thaJeztah/rename-desired_state-filter
...
rename desired_state filter to desired-state
Upstream-commit: b8988824616017a7ff4a13475dde23f7677aa21c
Component: engine
2016-07-01 18:34:02 +02:00
bda6fa8f54
Add support for external CAs
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 11085b2260a78b3248f3e98e0a1e3203431fae22
Component: engine
2016-06-30 17:22:47 -07:00
b73379e968
Update to new swarmkit/engine-api
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 9b652738363d92fbe6e43b3981cdcc94bdb72c76
Component: engine
2016-06-30 17:22:47 -07:00
e32550579c
Merge pull request #23584 from nishanttotla/private-images-swarm-services
...
Passing registry auth token for service create, update
Upstream-commit: 8fe6480c8a26f80fe174ae93e1b380bb7ec6083c
Component: engine
2016-06-30 17:18:59 -07:00
9f0a770513
Adding a flag to specify sending of registry auth
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: 538bac39d7fe93562922b89e9a294096be48fb59
Component: engine
2016-06-30 14:59:32 -07:00
6b4b42d73a
rename desired_state filter to desired-state
...
For consistency with other filters (such as
"is-official"), this renames the desired_state
filter to "desired-state".
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d761719eb4e45fbd6f092f6d0b4eb42206e298f6
Component: engine
2016-06-30 14:49:46 -07:00
c93d8a8a0f
Merge pull request #24125 from vdemeester/24117-node-task-filter
...
Fix --filter=desired_state behaviour
Upstream-commit: 9d18fda08d3ae4d9654f1fc1ec7a1f8afefebf75
Component: engine
2016-06-30 14:08:05 -07:00
36333fbd7e
Merge pull request #24175 from allencloud/fix-comments-and-handle-err
...
fix comments and handle err
Upstream-commit: cbc4fd2131d06c0342a330843a02632034f1db7b
Component: engine
2016-06-30 19:22:47 +02:00
edfdc3750d
Merge pull request #24159 from yongtang/24090-docker-node-list-hostname
...
Use HOSTNAME in the output of `docker node ls`
Upstream-commit: 0f687aafafb1b3f3503e71e6a04e766cc85f4372
Component: engine
2016-06-30 09:28:57 -07:00
5af62950c4
Merge pull request #24174 from runcom/fix-grammar
...
fix warn message typos
Upstream-commit: e84b91d8f5859778f43b03890e79b02610d82841
Component: engine
2016-06-30 17:05:06 +02:00
9ea890bdf9
Merge pull request #24171 from allencloud/make-cmd-short-consistency
...
make cmd short consistency
Upstream-commit: 294791e9ed36eff4b93d6cec0da9ed3ed805d549
Component: engine
2016-06-30 16:59:32 +02:00
24d57a19bb
fix comments and handle err
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: cc054f3195308da471c252d755dacfe446cb1066
Component: engine
2016-06-30 21:53:20 +08:00
939b820305
make cmd short short consistency and change docs
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 184afb92bf0bda1f47b5e1812ee1134328e272e2
Component: engine
2016-06-30 21:17:51 +08:00
169947bdeb
fix warn message typos
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: a4143e6756d697323d560396dff6b90168a1e56c
Component: engine
2016-06-30 15:17:37 +02:00
ac805da5d2
Remove dm.no_warn_on_loop_devices in info warning
...
I think we doesn't provide dm.no_warn_on_loop_devices option
at all. I didn't found any code to handle this option.
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 2aa01e0fbc76ecb8cf1a1b608e254e6cb8821ff7
Component: engine
2016-06-30 14:57:46 +08:00
8038d9fddd
Use HOSTNAME in the output of docker node ls
...
This fix tries to address an issue raised in #24090 where
the title field of `docker node ls` use NAME instead of
HOSTNAME. Yet the content of this field is actually
hostname.
The fix makes needed changes for the output of
`docker node ls`.
An additional test has been added to cover the change in
this fix.
This fix fixes #24090 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 4bc91ceeb750db6a6270b2f1821cb0b2f30117fc
Component: engine
2016-06-29 19:54:16 -07:00
cddb6e635c
Updating header name and executor
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: af5df117a805c8df661c7efa58c57680019b5752
Component: engine
2016-06-29 13:26:19 -07:00
beffe0658c
Fix mount opts error message.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c8659d3cc501449a69a7e0b79994b42799750f29
Component: engine
2016-06-29 15:14:55 -04:00
8a1b995558
Merge pull request #23946 from dnephin/service-update-args
...
Fixes for `service update` of Args
Upstream-commit: 1e7ba55494eff0f38aa503b81576519b7b383644
Component: engine
2016-06-29 20:24:07 +02:00
943b955f19
Fix service update of Args
...
add a unit test
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 07b59ef210490df19f65da950d7d41176d104a31
Component: engine
2016-06-29 12:41:57 -04:00
a758d1d64d
Fix --filter=desired_state behaviour
...
Just like `docker service tasks`, we should add `desired_state` filters
only in case there is no provided filters.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 3c194bd2a4fb4693deba366b3400c2efeeb90369
Component: engine
2016-06-29 17:40:34 +02:00
4850c6643f
Return an empty network list if nothing matches filter
...
Initializing the network list struct in order to return an empty list
instead of a nil object.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a7043ac5c423cf68d4f92024e694887099640d91
Component: engine
2016-06-29 00:06:44 +02:00
b75c9d3100
Passing registry auth token for service create and update
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: 93ec5cda55e78dbb683b59bde244a7984b323574
Component: engine
2016-06-28 13:53:01 -07:00
48b4d2f0b1
Merge pull request #23697 from dongluochen/blockServiceModeChange
...
Do not allow service mode change
Upstream-commit: e2a26744f987199dca7eacf93e3e236764c87f5e
Component: engine
2016-06-27 10:53:53 -04:00
aba19163d1
uppercase output in node inspect to keep consistency
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 89582e1a34a570c27232cd394d38f7fddf7e6520
Component: engine
2016-06-27 18:29:27 +08:00
f48a15762d
Merge pull request #23945 from aanand/update-bundle-extension
...
Update bundle extension
Upstream-commit: 58f1ae1641b81e3117a0e602e70464a139dcf74d
Component: engine
2016-06-25 17:00:33 +02:00
20c3dc512a
Merge pull request #23934 from cpuguy83/23862_fix_bind_opts
...
Fix panic due to nil bind options
Upstream-commit: b2ba44b11d7d05c43f3710946dbb9960c7b0adc7
Component: engine
2016-06-24 16:17:38 -07:00
33bb05c194
Merge pull request #23281 from yongtang/23211-spf13-cobra-update
...
Use spf13/cobra for docker update
Upstream-commit: e5a8a7747ef8b9ac6ed4e508cd16a5cf2a44485c
Component: engine
2016-06-24 14:31:53 -07:00
e535398871
Merge pull request #23935 from LK4D4/fix_net_create_use
...
cli: fix network create usage
Upstream-commit: 824290a37e09f3411ceec439566c1e6c968a80ed
Component: engine
2016-06-24 16:55:12 -04:00
ec40967812
Update bundle extension
...
It's now .dab, for Distributed Application Bundle
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
Upstream-commit: 61e2d4240ba266518d0a9a862a88201e54502a88
Component: engine
2016-06-24 12:32:35 -07:00
1d708b7135
Merge pull request #23933 from yp-engineering/service-log-typo
...
Fixing typo on service log output.
Upstream-commit: b73b303b1c974ea6d168eebdc2011b0802999ff1
Component: engine
2016-06-24 11:56:31 -07:00
41c3862b06
cli: fix network create usage
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 159e7341ad80d6926fd9c09585afcc2abda25415
Component: engine
2016-06-24 09:32:39 -07:00
97e724b6b5
Fix panic due to nil bind options
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 4c2e1a9cb04614d360e91a81959cb196380283b1
Component: engine
2016-06-24 11:57:17 -04:00
645bbecbd4
Merge pull request #23875 from tonistiigi/task-node-down
...
Do not show tasks from down nodes as active in ls
Upstream-commit: cf54dfba349627a24c6f7b8e035367a7a9f68f84
Component: engine
2016-06-24 10:07:25 +02:00
852cc7fc30
Fixing typo on service log output.
...
Signed-off-by: Adam Avilla <aavilla@yp.com >
Upstream-commit: 7cc6fe575895dca6c50c4eadb0fd4c4986d05048
Component: engine
2016-06-23 14:54:40 -07:00
59b0cca4d4
For the lulz! (evalulate -> evaluate)
...
Signed-off-by: orkaa <orkica@gmail.com >
Upstream-commit: 1bdbfa57709586f9fa747c2323bc3cd3b03e90f0
Component: engine
2016-06-23 16:26:43 +02:00
a185c1fb92
Do not show tasks from down nodes as active in ls
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 5d4401d6d72c647fa61501c40949b2d67c3f958b
Component: engine
2016-06-22 14:49:24 -07:00
c04403422d
Merge pull request #23829 from LK4D4/cleanup_unused
...
api,daemon: cleanup some unused stuff
Upstream-commit: 506234e3f0f6d8f8a0629e09f38dfe96ada025c2
Component: engine
2016-06-22 11:58:57 -07:00
266d9f9808
Merge pull request #23832 from tonistiigi/unify-swarm-init-update
...
Unify swarm init and update options
Upstream-commit: df6630f6a3c08548f355a255e18f01c9fcb0ad86
Component: engine
2016-06-22 11:56:07 -07:00
82ca53bf58
Use spf13/cobra for docker update
...
This fix is part of the effort to convert commands to spf13/cobra #23211 .
Thif fix coverted command `docker update` to use spf13/cobra
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 9765593c5f7cdd3ef16dbd0cae35bb68cf5542ef
Component: engine
2016-06-22 11:06:44 -07:00
8c9dd4362c
Unify swarm init and update options
...
Add api side validation and defaults for init and
join requests.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: fb3eb1c27ef5520571c599ead8a72b343748db39
Component: engine
2016-06-21 16:34:32 -07:00
44cb4a4db6
api,daemon: cleanup some unused stuff
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: ed5d335e22143b35f928e5a8740b046c21db808b
Component: engine
2016-06-21 14:15:19 -07:00
923b4bd8ef
fix some typos
...
Signed-off-by: bin liu <liubin0329@gmail.com >
Upstream-commit: 950073aabb305db6156709ea8509b1f72ff06f3b
Component: engine
2016-06-21 15:29:25 +08:00
17b17e3e6c
Merge pull request #23399 from tkopczynski/23211-info-command
...
Migrate info command to cobra
Upstream-commit: e7fd7848688719221853886e9871baa5b09953c1
Component: engine
2016-06-20 09:38:53 -07:00
7768ca41d3
Remove dead code from node update.
...
Also share mode code between update commands
and use flag constants
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: cacaeab9db51f42c33872c6cce1adc3e55f1c9c5
Component: engine
2016-06-20 11:05:48 -04:00
22e8ff931c
Use flag constants for swarm flag.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c08a50dbd1bac8a0bf1c9be5e617273c19a54a2e
Component: engine
2016-06-20 11:04:37 -04:00
c30cfa209c
add more flag constants to service update.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 9d1f3373b3678033c1be197fafc55010cc8531dd
Component: engine
2016-06-20 11:03:36 -04:00
225672de47
Merge pull request #23731 from WeiZhang555/fix-help
...
Make --help information consistent
Upstream-commit: 70e47c4f75589e2ca46934b0f3c07b3ad87eb92d
Component: engine
2016-06-19 16:12:09 -07:00
3ab13e9c6a
Make --help information consistent
...
Other docker command always print "[OPTIONS]" right after `docker
COMMAND`, but `build` and `push` has inconsistent help message.
This commit will fix help information format.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 0e5397633628ab154fae33152de7dc1fd4e122db
Component: engine
2016-06-19 16:26:23 +08:00
b8c843c318
Fix docker start error with renamed container
...
This fix tries to fix the issue raised in #23716 where `docker start`
causes an error of `No such container:` if the container has been
renamed before `docker start` returns.
The issue is that `docker start` use container name passed at the
beginning to check for exit code at the end of the `docker start`.
This fix addresses the issue by always use container's `ID` to get
the information during `docker start`.
Additional integration tests have been added to cover this fix.
This fix fixes #23716 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 6e86733b47faf0d7629751987346022544b65cb7
Component: engine
2016-06-18 16:43:30 -07:00
