Commit Graph

13 Commits

Author SHA1 Message Date
d0e36ad78e Merge pull request #28266 from tonistiigi/fix-service-update-test
Fix flaky TestServiceUpdateSecrets
Upstream-commit: 45585ab7a5097bd0b9b2db1c8a50927a62201b75
Component: engine
2016-11-11 01:17:29 -05:00
b688822593 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>
Upstream-commit: 14ac9f60d0174256e0713701ebffaf5ca827da71
Component: engine
2016-11-10 18:07:55 -08:00
c4c2fd866c Fix flaky TestServiceUpdateSecrets
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: fc21fcc90e5e1270aeb60f8f871adfd18e618c21
Component: engine
2016-11-10 13:59:28 -08:00
9c2b1fd34a secrets: use explicit format when using secrets
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 2adbdcdf5a83b45b4e191413d3aa14158535085b
Component: engine
2016-11-09 14:27:44 -05:00
6984dffbb5 update tests for service create and update
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: ca6b6535519881357c9e3bba5fe0d8965ce8077c
Component: engine
2016-11-09 14:27:44 -05:00
da6add7ce9 secrets: add service create and update integration tests
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 76b33fdb99a6395670b8b466a5ef65a8b928be94
Component: engine
2016-11-09 14:27:44 -05:00
29459f6822 Windows: docker top implementation
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 52f0474851298e7ba70b1a7ea16e3421d5926c98
Component: engine
2016-09-07 16:29:02 -07:00
45ddc4bfcb Add engine-api types to docker
This moves the types for the `engine-api` repo to the existing types
package.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 91e197d614547f0202e6ae9b8a24d88ee131d950
Component: engine
2016-09-07 11:05:58 -07:00
3564d84153 Remove unnecessary CmdWithArgs
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c0d2f7b33869cf749efcbab003bdb9bd2f665cec
Component: engine
2016-07-28 20:14:14 -04:00
d2f3f931f0 fix panic on --label-add
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 85bc3194aa12c19a5bd755666d1e9617dc1bb322
Component: engine
2016-07-25 19:20:44 -04:00
8f0edf84fe Change the add/update flags to include 'add'
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4c6faa434071b87a55256e86020cb78495e9951d
Component: engine
2016-07-13 16:06:25 -04:00
61271c6fdb Add remove flags for service update
with unit tests

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: dc33fc1ff433fcc70efc22f5cea9b87c6ec64a3b
Component: engine
2016-07-13 16:06:25 -04:00
89ce4731a6 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>
Upstream-commit: 1f8ab93b4422a88ef3053105c17acf1933576fbe
Component: engine
2016-06-17 17:09:40 -07:00