e815956d17
Fix service rollback options being cross-wired
...
The "update" and "rollback" configurations were cross-wired, as a result, setting
`--rollback-*` options would override the service's update-options.
Creating a service with both update, and rollback configuration:
docker service create \
--name=test \
--update-failure-action=pause \
--update-max-failure-ratio=0.6 \
--update-monitor=3s \
--update-order=stop-first \
--update-parallelism=3 \
--rollback-failure-action=continue \
--rollback-max-failure-ratio=0.5 \
--rollback-monitor=4s \
--rollback-order=start-first \
--rollback-parallelism=2 \
--tty \
busybox
Before this change:
docker service inspect --format '{{json .Spec.UpdateConfig}}' test \
&& docker service inspect --format '{{json .Spec.RollbackConfig}}' test
Produces:
{"Parallelism":3,"FailureAction":"pause","Monitor":3000000000,"MaxFailureRatio":0.6,"Order":"stop-first"}
{"Parallelism":3,"FailureAction":"pause","Monitor":3000000000,"MaxFailureRatio":0.6,"Order":"stop-first"}
After this change:
{"Parallelism":3,"FailureAction":"pause","Monitor":3000000000,"MaxFailureRatio":0.6,"Order":"stop-first"}
{"Parallelism":2,"FailureAction":"continue","Monitor":4000000000,"MaxFailureRatio":0.5,"Order":"start-first"}
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f367aa9330
Component: cli
2018-05-11 11:47:05 +02:00
5727dc3154
Merge pull request #1047 from eightlimbed/eightlimbed-patch-1
...
fixed typo
Upstream-commit: ab1d49a313
Component: cli
2018-05-10 10:32:07 +02:00
57c3c89455
Make sure every composefiles sent to a v1beta1 endpoint are parsable
...
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com >
Upstream-commit: f766aff716
Component: cli
2018-05-09 13:17:25 -07:00
ec34094dc5
Fix stack ls behaviour with Kubernetes and variout --namespace flag values
...
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com >
Upstream-commit: 2af66bed41
Component: cli
2018-05-09 17:40:25 +02:00
818645f8cd
Add --all-namespaces to docker stack ls command on Kubernetes orchestrator, to list all stacks in all namespaces.
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: f097831eb3
Component: cli
2018-05-09 17:33:16 +02:00
f151bd57f8
Add namespace column for docker stack ls command while targeting Kubernetes orchestrator
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: 65526a201f
Component: cli
2018-05-09 17:33:16 +02:00
3d9a405e51
Move stack client creation from KubeCli to client factory, where it belongs
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: 31dccfffb5
Component: cli
2018-05-09 17:30:37 +02:00
ceea6abb71
Clean useless named imports
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: c23c1482c7
Component: cli
2018-05-09 17:30:36 +02:00
fd51a4f0df
Fix using the namespace specified in the kubeconfig file.
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: f0aa126b03
Component: cli
2018-05-09 17:30:36 +02:00
4785c706cc
fixed typo -- Signed-off-by: Lee Gaines <eightlimbed@gmail.com>
...
Upstream-commit: 9570911807
Component: cli
2018-05-08 14:46:42 -07:00
daa5cc4d8f
Added description about pids count.
...
Documentation in response to issue docker/for-linux#192
Signed-off-by: Ioan Eugen Stan <eu@ieugen.ro >
Upstream-commit: 966de2a5f9
Component: cli
2018-05-08 22:16:15 +03:00
c76949856e
Update prune.go
...
Append a warning with which filter the elements will be pruned with if filter is set.
Signed-off-by: Justyn Temme <justyntemme@gmail.com >
Upstream-commit: 7d113de085
Component: cli
2018-05-08 09:08:26 -05:00
7f36f33bdc
Merge pull request #818 from selansen/master
...
Allow user to specify default address pools for docker networks
Upstream-commit: c31b61bff4
Component: cli
2018-05-08 14:17:00 +02:00
572d6e715f
Use filepath.Base instead of path.Base
...
This ensures Windows paths are handled correctly as explained in the path package documentation.
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com >
Upstream-commit: 698ea75c66
Component: cli
2018-05-07 17:25:23 +02:00
8f43102f04
Allow user to specify default address pools for docker networks
...
This is separate commit for CLI files to address PR 36054
Signed-off-by: selansen <elango.siva@docker.com >
Upstream-commit: 75c7b95e7a
Component: cli
2018-05-05 19:46:28 -04:00
c91662ddb9
update docker Login subcommand completions
...
Signed-off-by: Kyle Spiers <Kyle@Spiers.me >
Upstream-commit: 4d890fc686
Component: cli
2018-05-05 01:35:48 -07:00
a788020da9
update docker Load subcommand completions
...
Signed-off-by: Kyle Spiers <Kyle@Spiers.me >
Upstream-commit: 647d4c983f
Component: cli
2018-05-05 01:33:47 -07:00
10f5ddc3c1
update docker Inspect subcommand completions
...
Signed-off-by: Kyle Spiers <Kyle@Spiers.me >
Upstream-commit: 20f269a1ff
Component: cli
2018-05-05 01:27:43 -07:00
a6af640f78
update docker Import subcommand completions
...
Signed-off-by: Kyle Spiers <Kyle@Spiers.me >
Upstream-commit: 202601b774
Component: cli
2018-05-05 01:22:45 -07:00
dc691e94bb
update docker Images subcommand completions
...
Signed-off-by: Kyle Spiers <Kyle@Spiers.me >
Upstream-commit: 82c5693cf9
Component: cli
2018-05-05 01:19:35 -07:00
15f2c99486
update docker History subcommand completions
...
Signed-off-by: Kyle Spiers <Kyle@Spiers.me >
Upstream-commit: ba4e802b4f
Component: cli
2018-05-05 01:17:44 -07:00
7f5fd0a3b4
update docker Export subcommand completions
...
Signed-off-by: Kyle Spiers <Kyle@Spiers.me >
Upstream-commit: fb16dc68be
Component: cli
2018-05-05 01:07:32 -07:00
9cc62e81cb
update docker Exec subcommand completions
...
Signed-off-by: Kyle Spiers <Kyle@Spiers.me >
Upstream-commit: 3eb6b2c9c0
Component: cli
2018-05-03 12:48:25 -07:00
a089f44a79
update docker Events subcommand completions
...
Signed-off-by: Kyle Spiers <Kyle@Spiers.me >
Upstream-commit: 21477d9576
Component: cli
2018-05-03 12:42:41 -07:00
ec16580804
Merge pull request #922 from kolyshkin/man-fixes
...
Man page fixes
Upstream-commit: 0ff5f52051
Component: cli
2018-05-03 07:34:06 -10:00
0246710e59
Merge pull request #1005 from eiais/fishupdate
...
Update Attach, Build, Commit, Cp, Create subcommand fish completions
Upstream-commit: e956159572
Component: cli
2018-05-03 10:28:53 +02:00
3d4a877b7f
Merge pull request #1006 from essamhassan/908_show_secrets_configs_srv_inspect
...
908 - Adding configs/secrets to service inspect pretty
Upstream-commit: e9731e9d0f
Component: cli
2018-05-03 10:12:51 +02:00
ec3e6ec6a5
Bump version to 18.06.0-dev
...
Docker-CE 18.05.0-rc1 was cut off from these commits;
- docker-ce 18.05 branch created for code freeze: https://github.com/docker/docker-ce/tree/18.05
- engine: https://github.com/moby/moby/tree/1a57535
- cli: https://github.com/docker/cli/tree/4970824
- packaging: https://github.com/docker/docker-ce-packaging/tree/c216602
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: deb8bd740b
Component: cli
2018-05-02 12:11:23 +02:00
8fa7a28767
Merge pull request #1026 from dhiltgen/expose_pull
...
Export pull as a public function
Upstream-commit: 784430737b
Component: cli
2018-05-02 12:07:49 +02:00
09778021e4
Merge pull request #1024 from clnperez/manifest-token-perms
...
manifest list: request specific permissions
Upstream-commit: f42c66bd24
Component: cli
2018-04-30 20:22:11 +02:00
4502df9e25
Merge pull request #1028 from nstapelbroek/feature/exec-die-event
...
Add exec_die to the list of known container events
Upstream-commit: 8103326311
Component: cli
2018-04-30 12:26:28 +02:00
2ff7c2ca43
Add an orchestrator column in the docker stack ls command
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: 13d0c9c695
Component: cli
2018-04-30 12:04:02 +02:00
d432dda560
Print warnings on stderr for each unsupported features while parsing a compose file for deployment on Kubernetes.
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: 36591a2282
Component: cli
2018-04-30 11:56:14 +02:00
de5526bad9
Add a common interface between different Kubernetes Stack API versions and use it in kubernetes stack commands
...
* Add kubernetes Stack API v1beta2 client
* Upgrade v1beta1 client to remove generated code
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: f958c66a6d
Component: cli
2018-04-30 11:27:22 +02:00
340f40eb39
Add exec_die to the list of known container events
...
Signed-off-by: Nico Stapelbroek <nstapelbroek@gmail.com >
Upstream-commit: 4d91812b88
Component: cli
2018-04-29 14:52:08 +02:00
240bba4fdb
Export pull as a public function
...
It will be helpful to expose the pull implementation which supports
pulling private images for other CLI commands that rely on helper images.
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com >
Upstream-commit: 812f113685
Component: cli
2018-04-27 12:21:19 -07:00
c783effbb0
Merge pull request #1017 from thaJeztah/warn-when-using-host-ip
...
Warn when using host-ip for published ports
Upstream-commit: 99bd7ed693
Component: cli
2018-04-25 17:09:42 -04:00
08243ac4d3
testing config/secrets are showing in pretty print
...
Signed-off-by: Essam A. Hassan <es.hassan187@gmail.com >
Upstream-commit: 8238644796
Component: cli
2018-04-25 17:22:18 +02:00
9193280536
add config and secret to service in inspect test
...
Signed-off-by: Essam A. Hassan <es.hassan187@gmail.com >
Upstream-commit: 2b1f27ea5e
Component: cli
2018-04-25 17:22:18 +02:00
8531403103
adding configs/secrets to service inspect pretty
...
Signed-off-by: Essam A. Hassan <es.hassan187@gmail.com >
Upstream-commit: 3ae2d4b24c
Component: cli
2018-04-25 17:21:31 +02:00
89facafb80
specify specific permissions
...
When creating manifest lists, don't use "*" as the permission when
creating the token handler. This causes problems with gitlab's repos.
Fixes https://github.com/docker/cli/issues/1010
Signed-off-by: Christy Norman <christy@linux.vnet.ibm.com >
Upstream-commit: c26e2264fb
Component: cli
2018-04-24 17:01:57 -05:00
e92b784d10
Cleaning some manifest documentation typos
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: 55c5e7aa88
Component: cli
2018-04-24 15:00:39 +02:00
ecd0192857
Merge pull request #1020 from vdemeester/todo-tada
...
Handle some TODOs in tests
Upstream-commit: c889ea1bca
Component: cli
2018-04-23 09:33:41 -04:00
637cb9eba9
Remove more TODOs
...
- Some of them don't make sense anymore
- Some are deprecated and removed from the engine since a few versions
already.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 740d260cd2
Component: cli
2018-04-23 14:57:29 +02:00
4485bdeb14
Remote FIXME(s) in vendor.conf
...
It's coming from dependencies, doesn't make sense here
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 58173b3c69
Component: cli
2018-04-23 14:14:45 +02:00
afba3f7a60
Handle some TODOs in tests
...
Use more gotestyourself for `env.Patch`, and `icmd.RunCommand`
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: ae03dd7f46
Component: cli
2018-04-23 14:13:52 +02:00
32854cab39
Merge pull request #1011 from vdemeester/mark-test-helpers
...
Make testing helpers as such…
Upstream-commit: c790f387e1
Component: cli
2018-04-23 11:20:12 +02:00
13669fec1f
Warn when using host-ip for published ports
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 363335ec9b
Component: cli
2018-04-21 12:49:47 -07:00
a597dea9bf
update docker Create subcommand fish completions
...
Signed-off-by: Kyle Spiers <kyle@spiers.me >
Upstream-commit: b491ad1589
Component: cli
2018-04-20 12:09:44 -07:00
5a48ec120d
update docker Cp subcommand fish completions
...
Signed-off-by: Kyle Spiers <kyle@spiers.me >
Upstream-commit: 49d8604875
Component: cli
2018-04-20 11:58:05 -07:00