1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Commit graph

29 commits

Author SHA1 Message Date
Yong Tang
55d05fc055 Replace "workdir' with const, same as other flags in service create
This is a minor fix that tries to replace `"workdir"` with const in `service create`.

Since `"workdir"` is the only string not defined as const in `func addServiceFlags()`,
I think it makes sense to replace `"workdir"` with a const to be consistent.

The flag `"workdir"` in `service update` has also been replaced.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-08-01 11:45:28 -07:00
Aaron Lehmann
f9c920a126 service update: Don't assume existing pointers in spec are valid
When updating values in the spec according to CLI flags, don't write
into the existing pointers. They may be nil. Instead, update them to
point to the new value we're writing.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-25 23:56:50 -07:00
Tibor Vass
e462b4507a Prevent panic on update --container-label-add
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 19:17:06 -07:00
Vincent Demeester
4031d70d1b Add container labels to service create/update
Swarm mode makes it possible through the API to set labels to containers
but not through command line. This tries to fix it.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-25 18:57:02 -07:00
Tibor Vass
afac3361dc Merge pull request #25023 from cpuguy83/25022_fix_label_panic
fix panic on --label-add
2016-07-25 18:13:15 -07:00
Brian Goff
85bc3194aa fix panic on --label-add
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-07-25 19:20:44 -04:00
Aaron Lehmann
57ae29aa74 Add failure action for rolling updates
This changes the default behavior so that rolling updates will not
proceed once an updated task fails to start, or stops running during the
update. Users can use docker service inspect --pretty servicename to see
the update status, and if it pauses due to a failure, it will explain
that the update is paused, and show the task ID that caused it to pause.
It also shows the time since the update started.

A new --update-on-failure=(pause|continue) flag selects the
behavior. Pause means the update stops once a task fails, continue means
the old behavior of continuing the update anyway.

In the future this will be extended with additional behaviors like
automatic rollback, and flags controlling parameters like how many tasks
need to fail for the update to stop proceeding. This is a minimal
solution for 1.12.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-25 08:51:19 -07:00
Stephen J Day
e778ba2d5b
swarm: add log driver support for services
Adds log driver support for service creation and update. Add flags
`--log-driver` and `--log-opt` to match `docker run`. Log drivers are
configured per service.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-07-15 21:39:27 -07:00
Daniel Nephin
3249c1d0e7 Fix multi-remove during service update.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-07-13 16:11:08 -04:00
Daniel Nephin
4c6faa4340 Change the add/update flags to include 'add'
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-07-13 16:06:25 -04:00
Daniel Nephin
ead1f62aba PR feedback
improve help text for service update remove flags
implement proper merge update of placement flag
more code re-use in update functions using a toRemove set.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-07-13 16:06:25 -04:00
Daniel Nephin
dc33fc1ff4 Add remove flags for service update
with unit tests

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-07-13 16:06:25 -04:00
Daniel Nephin
674d227445 Merge service command and args as a string.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-07-13 12:31:16 -04:00
Vincent Demeester
e4a024d590
Remove --command flag for service update
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-13 16:19:21 +02:00
Brian Goff
140ec59db6 re-vendor engine-api
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-07-06 21:14:14 -04:00
Tõnis Tiigi
8fe6480c8a Merge pull request #23584 from nishanttotla/private-images-swarm-services
Passing registry auth token for service create, update
2016-06-30 17:18:59 -07:00
Nishant Totla
538bac39d7
Adding a flag to specify sending of registry auth
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-06-30 14:59:32 -07:00
Nishant Totla
af5df117a8
Updating header name and executor
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-06-29 13:26:19 -07:00
Daniel Nephin
07b59ef210 Fix service update of Args
add a unit test

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-06-29 12:41:57 -04:00
Nishant Totla
93ec5cda55
Passing registry auth token for service create and update
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-06-28 13:53:01 -07:00
Brian Goff
e2a26744f9 Merge pull request #23697 from dongluochen/blockServiceModeChange
Do not allow service mode change
2016-06-27 10:53:53 -04:00
Daniel Nephin
cacaeab9db 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>
2016-06-20 11:05:48 -04:00
Daniel Nephin
9d1f3373b3 add more flag constants to service update.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-06-20 11:03:36 -04:00
Dong Chen
72f7cebfb0 Block service mode change.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-06-17 23:04:37 -07:00
Arnaud Porterie (icecrime)
1f8ab93b44
Change docker service update semantics
Change `docker service update` to replace attributes of the target
service rather than augment them. One particular occurrence where the
previous behavior proved problematic is when trying to update a port
mapping: the merge semantics provided no way of removing published
ports, but strictly of adding more.

The utility merge* functions where renamed accordingly to update*.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
2016-06-17 17:09:40 -07:00
Vincent Demeester
4a70cb5571
Update ServiceInspectWithRaw
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-17 00:47:22 +02:00
Victor Vieux
1d380243fc prevent some panics in 'service update'
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-06-14 15:37:27 -07:00
Daniel Nephin
1b2c59bf86 Use constants for flag names.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-06-14 16:43:56 -04:00
Daniel Nephin
12a00e6017 Add Swarm management CLI commands
As described in our ROADMAP.md, introduce new Swarm management commands
to call to the corresponding API endpoints.

This PR is fully backward compatible (joining a Swarm is an optional
feature of the Engine, and existing commands are not impacted).

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-13 22:17:15 -07:00