docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,377 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

23 Commits

Author SHA1 Message Date
Stephen J Day 71a8ee2f49 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>
(cherry picked from commit e778ba2d5b1e5074fe413dffaa365f3d37b175c7)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-25 23:15:25 -07:00
Daniel Nephin fad55b0ea1 Change the add/update flags to include 'add' 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 4c6faa434071b87a55256e86020cb78495e9951d)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-25 23:14:59 -07:00
Daniel Nephin 1cf4bd4df7 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>
(cherry picked from commit ead1f62abae5e5ad188536a01fb88d55339e3f63)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-25 23:14:59 -07:00
Daniel Nephin b5f1b77a23 Add remove flags for service update 
with unit tests

Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit dc33fc1ff433fcc70efc22f5cea9b87c6ec64a3b)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-25 23:14:59 -07:00
Sebastiaan van Stijn 7491ebe00a Remove shorthand flags for "mount", "pretty", and "no-resolve" 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 7bf0faf42377a91a8535b443201d9ad62326889b)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-25 23:14:58 -07:00
Vincent Demeester cda05164ba Remove --command flag for service update 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit e4a024d5902df1d3db8b9fff8865304afa2305e6)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-25 23:14:57 -07:00
Vincent Demeester 23be238414 Use "on-failure" for both containers and services 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit a859a336475f39c7b7d7739c58a1dae40df86a86)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-08 15:33:21 -07:00
Brian Goff 843b4a93fe 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>
(cherry picked from commit 56f3422468a0b43da7bae7a01762ce4f0a92d9ff)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-08 15:32:30 -07:00
Anil Madhavapeddy 0a21d2b8d0 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>
(cherry picked from commit 2de9585f5ea798cbff23045d9d19ba239d5e5431)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-08 15:32:23 -07:00
Nishant Totla ae47b00c6c Adding a flag to specify sending of registry auth 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
(cherry picked from commit 538bac39d7fe93562922b89e9a294096be48fb59)
 2016-07-01 00:40:31 -07:00
Daniel Nephin 0d061f680a Fix mount opts error message. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit c8659d3cc501449a69a7e0b79994b42799750f29)
 2016-06-30 16:57:31 -07:00
Dong Chen 6661a20564 Block service mode change. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
(cherry picked from commit 72f7cebfb036f0fc74b9fa6fcc0c154f83f1605f)
 2016-06-30 16:47:50 -07:00
Brian Goff 5ff054ef51 Fix panic due to nil bind options 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 4c2e1a9cb04614d360e91a81959cb196380283b1)
 2016-06-30 16:47:49 -07:00
orkaa d4cdc5172c For the lulz! (evalulate -> evaluate) 
Signed-off-by: orkaa <orkica@gmail.com>
(cherry picked from commit 1bdbfa57709586f9fa747c2323bc3cd3b03e90f0)
 2016-06-30 16:47:45 -07:00
Daniel Nephin 7b0bb3f92c add more flag constants to service update. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 9d1f3373b3678033c1be197fafc55010cc8531dd)
 2016-06-30 16:47:39 -07:00
Victor Vieux 6b2cd6e843 accept uppercase endpoint mode 
Signed-off-by: Victor Vieux <vieux@docker.com>
(cherry picked from commit 8a0c5f157892efdfd5119410adedf0f04c9c16cf)
 2016-06-18 20:58:24 -07:00
Daniel Nephin bb8996d62b Fix String() for some option types 
and add unit tests for them.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit c26e7d8c9105e16048268a01dd1e556af43902cd)
 2016-06-16 23:36:54 -07:00
Arnaud Porterie (icecrime) 187b6607a4 Service `--update-parallelism` defauls to 0 
The `--update-parallelism` flaag should default to 0, which is
interpreted by the backend as unlimited. In other words, by default all
services should update simultaneously.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
(cherry picked from commit f22d0174f33e084445c5845c95aca346e187fb02)
 2016-06-16 23:36:53 -07:00
Tom Barlow 5e41ec703d Change 'invald' to 'invalid' in volume opts errors 
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
(cherry picked from commit bf988fc6ff90e1477d3fdab79cc7239511f32aba)
 2016-06-16 23:36:53 -07: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
Victor Vieux ffeb9fcb2a fix 2 potential panics with mounts in swarm 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-06-14 09:25:39 -07: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