toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
25,863 Commits 3 Branches 295 Tags
4e5748b717da91638eb4bf1aa53256bb5964591f
Commit Graph

66 Commits

Author SHA1 Message Date
Doug Davis
f9814c5993 Merge pull request #24832 from npcode/fix-service-rm-usage 
Fix the usage for `service rm` command
Upstream-commit: 3d4bde92b72c963a01419c4827909e355b44e6f2
Component: engine
 2016-07-20 06:44:34 -04:00
Yi EungJun
a90f40fdaf Fix the usage for service rm command 
Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
Upstream-commit: cf61cd3a920809f6a0be44a584f365544acaf1a9
Component: engine
 2016-07-20 18:27:26 +09:00
Daniel Nephin
8bb6df73dc Merge pull request #24722 from thaJeztah/update-usage-for-deprecated-flags 
Don't automagically add "[OPTIONS]" to usage
Upstream-commit: 68e52febdee553c2768ac7ea54817e0657d5ce8a
Component: engine
 2016-07-19 11:01:33 -04:00
Tibor Vass
a9e33b5e83 Merge pull request #24476 from stevvooe/services-log-driver-support 
swarm: add log driver support for services
Upstream-commit: 1796680381e7cb35eda14243a3fba1ac911ff908
Component: engine
 2016-07-18 19:08:12 -07:00
Sebastiaan van Stijn
24235167aa Don't automagically add "[OPTIONS]" to usage 
This removes the logic to automatically
add [OPTIONS] to the usage output.

The current logic was broken if a command
only has deprecated or hidden flags, and
in many cases put the [OPTIONS] in the
wrong location.

Requiring the usage string to be set
manually gives more predictable results,
and shouldn't require much to maintain.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 4f0b5105524649169d765bb94c2806209ab21904
Component: engine
 2016-07-19 00:07:19 +02:00
Stephen J Day
aa2ddf3393 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>
Upstream-commit: e778ba2d5b1e5074fe413dffaa365f3d37b175c7
Component: engine
 2016-07-15 21:39:27 -07:00
Daniel Nephin
6f7cdfbda7 Only show port name if set. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 909c596fa5956ed02b4708a437a828a2829c9bd5
Component: engine
 2016-07-15 16:02:04 -04:00
Vincent Demeester
f883751993 Merge pull request #23773 from dnephin/allow-remove-during-update 
Add remove flags for service update
Upstream-commit: 83f232e18670af884d84d10690e0c11c0e2f22b8
Component: engine
 2016-07-14 11:10:30 +02:00
Dong Chen
3f6cccd448 Fix service inspect --pretty. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: 08ae4e544d5744e975da0f89c4f04baa2b8474f2
Component: engine
 2016-07-14 00:11:29 -07:00
Daniel Nephin
e25d6b5a15 Fix multi-remove during service update. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3249c1d0e79f57642b96f6692ffa44f46f15b602
Component: engine
 2016-07-13 16:11:08 -04:00
Daniel Nephin
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
Daniel Nephin
b4c7aa8c2f 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>
Upstream-commit: ead1f62abae5e5ad188536a01fb88d55339e3f63
Component: engine
 2016-07-13 16:06:25 -04:00
Daniel Nephin
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
Tibor Vass
5ae05f5a48 Merge pull request #24195 from dnephin/service-update-better-args-and-command 
Update service `args` with a single flag (shlex)
Upstream-commit: fd8269b8f65b6b111e234d390e6f2226b85dbc6d
Component: engine
 2016-07-13 13:02:19 -07:00
Sebastiaan van Stijn
bb985637e2 Remove shorthand flags for "mount", "pretty", and "no-resolve" 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7bf0faf42377a91a8535b443201d9ad62326889b
Component: engine
 2016-07-13 18:47:29 +02:00
Daniel Nephin
04bb13f6d7 Merge service command and args as a string. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 674d227445887ea2f9a0fde6ebb7838bcce58578
Component: engine
 2016-07-13 12:31:16 -04:00
Vincent Demeester
1348489290 Remove --command flag for service update 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: e4a024d5902df1d3db8b9fff8865304afa2305e6
Component: engine
 2016-07-13 16:19:21 +02:00
Vincent Demeester
f5a13a7cbe Use "on-failure" for both containers and services 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: a859a336475f39c7b7d7739c58a1dae40df86a86
Component: engine
 2016-07-07 11:32:19 +02:00
Vincent Demeester
c201e7c4a2 Merge pull request #24053 from cpuguy83/mounts_default_writable 
Change defaults for mount writable and volume copying
Upstream-commit: 50674ec107a300067ded77912a2e39de88678c2c
Component: engine
 2016-07-07 11:18:14 +02:00
Brian Goff
7ac01fb32e Use newer default values for mounts CLI 
In the API:
`Writable` changed to `ReadOnly`
`Populate` changed to `NoCopy`

Corresponding CLI options updated to:
`volume-writable` changed to `volume-readonly`
`volume-populate` changed to `volume-nocopy`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 56f3422468a0b43da7bae7a01762ce4f0a92d9ff
Component: engine
 2016-07-06 22:34:39 -04:00
Brian Goff
892399249d re-vendor engine-api 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 140ec59db6e413de5025fb8686b97bf80b66c519
Component: engine
 2016-07-06 21:14:14 -04:00
Anil Madhavapeddy
b214ee32d9 make docker service --help text for --endpoint-mode more consistent 
Previously:

```
      --constraint value             Placement constraints (default [])
      --endpoint-mode string         Endpoint mode(Valid values: vip, dnsrr)
<snip>
      --restart-condition string     Restart when condition is met (none, on_failure, or any)
```

Now:

```
      --constraint value             Placement constraints (default [])
      --endpoint-mode string         Endpoint mode (vip or dnsrr)
<snip>
      --restart-condition string     Restart when condition is met (none, on_failure, or any)
```

Signed-off-by: Anil Madhavapeddy <anil@docker.com>
Upstream-commit: 2de9585f5ea798cbff23045d9d19ba239d5e5431
Component: engine
 2016-07-06 12:10:28 +01:00
Alexander Morozov
f3ff9e9f18 Merge pull request #24173 from vdemeester/tasks-filter-service-node-by-name 
Allow service and node filter to be name in `tasks` subcommands 
Upstream-commit: db75aa029d1843b3fdabb16c5cd9e1b3a99f39b2
Component: engine
 2016-07-05 12:16:57 -07:00
Vincent Demeester
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
Tõnis Tiigi
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
Nishant Totla
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
Sebastiaan van Stijn
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
allencloud
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
Vincent Demeester
a50f4824a7 Allow service and node filter to be name… 
… on `docker node tasks` and `docker service tasks` commands.
This changes is mainly server-side (between engine api and
swarmkit). There is just a check in `api/client/service/tasks.go` to
handle the special *self* meaning.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: b0fc5a21f1138f48e0431a550c936e8908d72840
Component: engine
 2016-06-30 15:09:03 +02:00
Nishant Totla
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
Daniel Nephin
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
Daniel Nephin
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
Nishant Totla
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
Brian Goff
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
Brian Goff
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
Vincent Demeester
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
orkaa
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
Tonis Tiigi
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
Daniel Nephin
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
Daniel Nephin
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
Sebastiaan van Stijn
d329d8c654 Merge pull request #23708 from vieux/lower_mode 
accept uppercase endpoint mode
Upstream-commit: 3911644782e7fdcbd8fae7a3fc86ffd4d99f191d
Component: engine
 2016-06-17 23:20:17 -07:00
Dong Chen
86bb1cfdfd Block service mode change. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: 72f7cebfb036f0fc74b9fa6fcc0c154f83f1605f
Component: engine
 2016-06-17 23:04:37 -07:00
Victor Vieux
015b610f8c accept uppercase endpoint mode 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 8a0c5f157892efdfd5119410adedf0f04c9c16cf
Component: engine
 2016-06-17 19:06:12 -07:00
Arnaud Porterie (icecrime)
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
Arnaud Porterie (icecrime)
4c5a5698fd Improve docker service inspect --pretty 
Remove capitalization in placement, and remove spurious `\t`.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
Upstream-commit: 3c60b7b9843276082c0ba4b868f354b9b44e9627
Component: engine
 2016-06-17 11:38:19 -07:00
Tibor Vass
800ec66e2d Merge pull request #23652 from dnephin/better-bundle-load-errors 
Improve the error messages for loading a bundle
Upstream-commit: a3795ca13ef031b6b2a17fad488c839281cd1de2
Component: engine
 2016-06-16 21:40:30 -07:00
Arnaud Porterie
c1713ee511 Merge pull request #23637 from vieux/add_more_fields_inspect 
add some more fields in docker service inspect -p
Upstream-commit: edfd546a6f8d1d9c80e9ff3abba88a78d4ac3550
Component: engine
 2016-06-17 01:40:26 +00:00
Victor Vieux
9dba03a4c5 add some more fields in docker service inspect -p 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 4c9e21b674046e8a3819cfbbb96f471bd280fba5
Component: engine
 2016-06-16 16:22:11 -07:00
Vincent Demeester
97ce44d0ef Update ServiceInspectWithRaw 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 4a70cb55710a76ee7dfa059c440c34fd6cb84f16
Component: engine
 2016-06-17 00:47:22 +02:00
Daniel Nephin
b2b2e47716 Add some tests for bundlefile and improve the error messages for LoadFile 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c0ea589c1b27f8b68e84cfe6692a7639da52ce6d
Component: engine
 2016-06-16 18:18:25 -04:00