wefine
2eb3e2ce0f
fix t.Errorf to t.Error in serveral _test.go
...
Signed-off-by: wefine <wang.xiaoren@zte.com.cn>
2016-11-14 17:54:43 +08:00
Brian Goff
d3169abc3b
Fix issue with missing fields for `ps` template
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-11-12 11:23:21 -05:00
yupeng
0f6af2074c
context.Context should be the first parameter of a function
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
2016-11-12 14:14:34 +08:00
Aaron Lehmann
7e7c4eefa4
cli: Add valid suffixes for remaining duration options
...
A recent PR added `(ns|us|ms|s|m|h)` to the descriptions of some
duration options, but not all. Add it to the remaining options for
consistency.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-11-11 17:44:42 -08:00
John Stephens
13d6a1bb67
Show experimental flags and subcommands if enabled
...
Signed-off-by: John Stephens <johnstep@docker.com>
2016-11-11 17:43:06 -08:00
John Howard
4088f3bcff
Planned 1.13 deprecation: email from login
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-11 17:32:46 -08:00
Vincent Demeester
827b121154
Merge pull request #28306 from ehazlett/service-create-no-secrets
...
only check secrets for service create if requested
2016-11-11 20:58:40 +01:00
Victor Vieux
460a7e213c
Merge pull request #28042 from yongtang/28018-docker-info-swarm-managers
...
Add information for `Manager Addresses` in the output of `docker info`
2016-11-11 09:30:01 -08:00
Brian Goff
356ff43768
Merge pull request #27872 from vdemeester/images-filter-filters
...
Add reference filter and deprecated filter param…
2016-11-11 11:24:19 -05:00
Sebastiaan van Stijn
57da27f76c
Merge pull request #28297 from vdemeester/compose-swarm-openstdin
...
Add support for stdin_open in compose to swarm
2016-11-11 17:09:04 +01:00
Yong Tang
cd71257cfd
Add information for `Manager Addresses` in the output of `docker info`
...
As is specified in 28018, it would be useful to know the manager's addresses
even in a worker node. This is especially useful when there are many
worker nodes in a big cluster.
The information is available in `info.Swarm.RemoteManagers`.
This fix add the information of `Manager Addresses` to the output
of `docker info`, to explicitly show it.
A test has been added for this fix.
This fix fixes 28018.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-11-11 07:35:32 -08:00
Evan Hazlett
885c5f1747
only check secrets for service create if requested
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2016-11-11 10:07:24 -05:00
Vincent Demeester
85e72de60c
Add reference filter and deprecated filter param…
...
… for `docker images`.
This deprecates the `filter` param for the `/images` endpoint and make a
new filter called `reference` to replace it. It does change the CLI
side (still possible to do `docker images busybox:musl`) but changes the
cli code to use the filter instead (so that `docker images --filter
busybox:musl` and `docker images busybox:musl` act the same).
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-11 15:34:01 +01:00
Vincent Demeester
3c61af0f76
Add reference filter and deprecated filter param…
...
… for `docker images`.
This deprecates the `filter` param for the `/images` endpoint and make a
new filter called `reference` to replace it. It does change the CLI
side (still possible to do `docker images busybox:musl`) but changes the
cli code to use the filter instead (so that `docker images --filter
busybox:musl` and `docker images busybox:musl` act the same).
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-11 15:34:01 +01:00
Vincent Demeester
84a795bf05
Add support for extra_hosts in composefile v3
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-11 15:20:02 +01:00
Vincent Demeester
f24ff647e1
Add support for stdin_open in composefile v3
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-11 15:19:00 +01:00
Vincent Demeester
356421b7da
Add support for tty in composefile v3
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-11 11:27:21 +01:00
Victor Vieux
19c8941f2f
Merge pull request #27955 from mlaventure/runc-docker-info
...
Add external binaries version to docker info
2016-11-10 21:27:14 -08:00
Tõnis Tiigi
795e487513
Merge pull request #28235 from dmcgowan/fix-registry-authorization-errors
...
Fix registry authorization errors
2016-11-10 19:39:28 -08:00
Victor Vieux
dc4d7a83ff
Merge pull request #28217 from Microsoft/jjh/373engineapifollowup
...
Tidy GetDockerOS() function
2016-11-10 18:57:56 -08:00
Wang Long
076bfc0647
Use '.' directly
...
Signed-off-by: Wang Long <long.wanglong@huawei.com>
2016-11-11 10:22:32 +08:00
Jana Radhakrishnan
148dc157f6
Add support for host port PublishMode in services
...
Add api/cli support for adding host port PublishMode in services.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-11-10 18:07:55 -08:00
Victor Vieux
7d89ba2d9d
Merge pull request #27998 from dnephin/compose-on-swarm
...
Support `docker stack deploy` from a Compose file
2016-11-10 17:59:57 -08:00
Lei Jitang
005a3037de
Merge pull request #28231 from yuexiao-wang/container-exec
...
Remove redundant parameter and fix typos
2016-11-11 09:55:42 +08:00
Derek McGowan
43bcd982cd
Update for distribution vendor
...
Handle updates to reference package.
Updates for refactoring of challenge manager.
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-11-10 17:34:12 -08:00
Victor Vieux
63167f17b0
Merge pull request #28226 from vieux/exit_exp_plugin
...
move plugins out of experimental
2016-11-10 17:30:54 -08:00
Victor Vieux
32beb80f99
Merge pull request #28031 from yongtang/27902-extra-hosts
...
Add flag `--host` to `service create` and `--host-add/rm` to `service update`
2016-11-10 16:55:29 -08:00
Victor Vieux
1f6f5bec49
move plugins out of experimental
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-11-10 15:51:32 -08:00
Victor Vieux
f5cea67e33
move plugins out of experimental
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-11-10 15:51:32 -08:00
Andrea Luzzardi
79e1fd01ce
Merge pull request #28089 from aluzzardi/service-logs
...
service logs
2016-11-10 15:13:41 -08:00
Victor Vieux
d04c77bdae
Merge pull request #28253 from aaronlehmann/arg-descriptions
...
cli: Change autolock flag description
2016-11-10 13:59:46 -08:00
Andrea Luzzardi
f88c041647
api: Service Logs support
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-11-10 13:46:02 -08:00
Andrea Luzzardi
b059cf5286
cli: docker service logs support
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-11-10 13:46:02 -08:00
Michael Crosby
6bf79deab5
Merge pull request #27797 from vdemeester/stats-format-names-support
...
Add support for Names and ID in stats format
2016-11-10 13:26:00 -08:00
Daniel Nephin
cb1783590c
Implement ipamconfig.subnet and be more explicit about restart policy always.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-10 16:22:31 -05:00
Aaron Lehmann
fd5673eeb9
cli: Change autolock flag description
...
This change incorporates feedback from @thaJeztah in the PR that added
the autolock flag. It changes the descriptions to be different for
"swarm init" and "swarm update" so that the boolean nature so that the
purpose of the flag in both contexts is clearer.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-11-10 12:05:19 -08:00
Yong Tang
6f3ee9c568
Add flag `--host` to `service create` and `--host-add/--host-rm` to `service update`
...
This fix tries to address 27902 by adding a flag `--host`
to `docker service create` and `--host-add/--host-rm` to
`docker service update`, so that it is possible to
specify extra `host:ip` settings in `/etc/hosts`.
This fix adds `Hosts` in swarmkit's `ContainerSpec` so that it
is possible to specify extra hosts during service creation.
Related docs has been updated.
An integration test has been added.
This fix fixes 27902.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-11-10 10:20:24 -08:00
Sebastiaan van Stijn
82c10dd9f9
Merge pull request #28243 from andrewhsu/change-context
...
use "golang.org/x/net/context" instead of "context"
2016-11-10 19:13:56 +01:00
Tibor Vass
fb0e903122
Merge pull request #28148 from vieux/rename_plugin_manifest
...
rename plugin manifest
2016-11-10 09:47:15 -08:00
Daniel Nephin
0333117b88
Handle bind options and volume options
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-10 12:37:17 -05:00
Daniel Nephin
458ffcd2e6
Restore stack deploy integration test with dab
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-10 11:28:19 -05:00
Aanand Prasad
791b687848
Reinstate --bundle-file argument to 'docker deploy'
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-10 11:28:18 -05:00
Daniel Nephin
d05510d954
Add integration test for stack deploy.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-10 11:28:18 -05:00
Daniel Nephin
3875355a3e
Remove bundlefile
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-10 11:28:18 -05:00
Daniel Nephin
ef845be6a5
Remove duplication of name mangling.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-10 11:28:18 -05:00
Daniel Nephin
d89cb4c62f
Always use a default network if no other networks are set.
...
also add network labels.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-10 11:28:18 -05:00
Daniel Nephin
ae8f001829
Send warnings to stderr.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-10 11:28:18 -05:00
Aanand Prasad
25c93d4ebb
Default to replicated mode
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-10 11:28:18 -05:00
Aanand Prasad
dfab8f2bd4
Handle unsupported, deprecated and forbidden properties
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-10 11:28:18 -05:00
Daniel Nephin
e1b96b6447
Add swarmkit fields to stack service.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-10 11:28:18 -05:00