Commit Graph

5196 Commits

Author SHA1 Message Date
Vincent Demeester 4a66821309
Merge pull request #768 from thaJeztah/warn-unsupported-pid
Add "pid" to unsupported options list
2018-01-02 15:14:08 +01:00
muicoder e2f73bb4b7
Fix bash completion for "docker swarm"
Signed-off-by: muicoder <muicoder@gmail.com>
2018-01-01 12:58:16 +08:00
Silvin Lubecki ad409767bf Activate kubernetes only when experimental cli is enabled
* Refactor tests on version and kubernetes switch
* Fix rebase errors
* Refactor for gocyclo linter

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
2017-12-28 14:40:10 +01:00
Vincent Demeester 5d375b348a Set a global orchestrator flag
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-12-28 14:40:10 +01:00
Vincent Demeester 12c0825a4c Update golang.org/x/net to not panic
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-12-28 14:40:09 +01:00
Sebastiaan van Stijn 70a29b492d
Add "pid" to unsupported options list
Services do not support custom "pid"-modes (e.g. `--pid=host`), but this
option was ignored silently when deploying a stack.

This patch adds `pid` to the list of unsupported options so that a warning
is printed;

With this patch applied:

    $ docker stack deploy -c docker-compose.yml foobar
    Ignoring unsupported options: pid

    Creating network foobar_default
    Creating service foobar_test

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-12-27 12:45:42 +01:00
Sebastiaan van Stijn a5fe375289
Merge pull request #765 from thaJeztah/remove-incorrect-link
Remove reference to non-existing "stack config" command
2017-12-26 18:16:37 +01:00
Sebastiaan van Stijn 424fe2bb2e
Remove reference to non-existing "stack config" command
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-12-26 16:47:45 +01:00
Vincent Demeester 1a2244e384 Error out on orchestrator command that don't support k8s yet
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-12-26 11:46:59 +01:00
Silvin Lubecki ba5d0d8ff5 Move e2e test on version command to unit tests
* Refactor a little version command

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
2017-12-26 11:46:59 +01:00
Vincent Demeester 61713c42a4 Update vendoring
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-12-26 11:45:56 +01:00
Vincent Demeester 3a01d6a40a Fix e2e test (and add a comment that it's not the best fix)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-12-26 11:45:56 +01:00
Vincent Demeester f5073f81d2 Update warning
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-12-26 11:45:56 +01:00
Vincent Demeester 0b5883f953 add kubernetes/ README
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-12-26 11:45:56 +01:00
Vincent Demeester b5170bde03 Take @nass review into account
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-12-26 11:45:56 +01:00
Vincent Demeester dedd0db51a Refactor stack command
- Define command and subcommands only once
- Use annotations for k8s or swarm specific flags or subcommands

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-12-26 11:45:56 +01:00
Vincent Demeester 0508c09494 Move cli/command/orchestrator to cli/command
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-12-26 11:25:22 +01:00
Vincent Demeester f960d2d5f3 Move /cli/command/stack/kubernetes/api to /kubernetes
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-12-26 11:22:32 +01:00
Vincent Demeester 1ff277ad8f Fix some build failures
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-12-26 11:22:32 +01:00
Vincent Demeester 8417e49792 Add support for kubernetes in docker cli
- Add support for kubernetes for docker stack command
- Update to go 1.9
- Add kubernetes to vendors
- Print orchestrator in docker version command

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
2017-12-26 11:22:32 +01:00
Sebastiaan van Stijn 70db7cc0fc
Merge pull request #758 from vdemeester/experimental-cli
Add support for experimental Cli configuration
2017-12-22 14:56:40 +01:00
Vincent Demeester 84fe1a1b5b
Add support for experimental Cli configuration
Allow to mark some commands and flags experimental on cli (i.e. not
depending to the state of the daemon). This will allow more flexibility
on experimentation with the cli.

Marking `docker trust` as cli experimental as it is documented so.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-12-22 14:48:47 +01:00
Sebastiaan van Stijn ebb8927a2a
Merge pull request #761 from sourabhtk37/patch-1
Corrected descriptions for MAC_ADMIN and MAC_OVERRIDE
2017-12-21 11:43:21 +01:00
T K Sourabh afcc78aae3 Corrected descriptions for MAC_ADMIN and MAC_OVERRIDE
The description for capabilities are mismatched for MAC_ADMIN and MAC_OVERRIDE.

Signed-off-by: T K Sourabh <sourabhtk37@gmail.com>
2017-12-21 16:06:32 +05:30
Sebastiaan van Stijn 2f3b13742f
Merge pull request #759 from mistyhacks/link-to-attack-surface
Fix typo in link
2017-12-21 08:33:16 +01:00
Misty Stanley-Jones 946cb0d4fd Fix typo in link
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-12-20 15:35:22 -08:00
Vincent Demeester 2b8eb23b8c
Merge pull request #757 from pszczekutowicz/master
Return errors from client in stack deploy configs
2017-12-19 11:05:49 +01:00
Paweł Szczekutowicz a30dd1b6f3 Return errors from client in stack deploy configs
Signed-off-by: Paweł Szczekutowicz <pszczekutowicz@gmail.com>
2017-12-18 21:34:04 +01:00
Kir Kolyshkin 8471742a8a Show container wait error
If container wait has failed, show an error from the engine
and return an appropriate exit code.

This requires engine changes from https://github.com/moby/moby/pull/34999

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2017-12-15 14:15:30 -08:00
Daniel Nephin 718a245b6e
Merge pull request #713 from albers/completion-512
Fix #512 Bash autocompletion works incorrect with inspect
2017-12-15 16:33:41 -05:00
Harald Albers f2b42bb6a8 Simplify bash completion for service options
Previously, the completions for `--xxx` and the corresponding
`-xxx-add` and `-xxx-rm` options were defined in separate blocks.
This caused a lot of duplicated code.

This PR removes duplication for xxx=config|group|host|placement-pref|secret.

Now the blocks for `create` and `update` only contain completions for
options that either only exist for the particular command or are specific
to it (completions for `--env-rm` and `--env|env-add` differ).

Signed-off-by: Harald Albers <github@albersweb.de>
2017-12-15 13:49:42 +01:00
Harald Albers d149c93c0c Fix bash completion for service env, mounts and labels
`service create` and `service update` both used to have `--env`, `--label`
and `--mount` options.
These options now are only valid for `service create`.
`service update` got corresponding `--xxx-add|rm` options instead.

Signed-off-by: Harald Albers <github@albersweb.de>
2017-12-15 13:49:42 +01:00
Sebastiaan van Stijn 69b11daa77
Merge pull request #753 from thaJeztah/image-shortid
Updated deprecation status for "repository:shortid"
2017-12-15 01:35:11 -08:00
Sebastiaan van Stijn 8684b99923
Merge pull request #749 from albers/completion--generic-resource
Add support for generic resources to bash completion
2017-12-15 01:08:42 -08:00
Harald Albers 8ec80eec67 Add support for generic resources to bash completion
Adds bash completion for
- `service create --generic-resource`
- `service update --generic-resource-(add|rm)`
- `dockerd --node-generic-resource`

Signed-off-by: Harald Albers <github@albersweb.de>
2017-12-15 08:56:14 +01:00
Sebastiaan van Stijn ee3ffd6540
Merge pull request #751 from ktrysmt/fix/zsh-completions
Fix error in zsh completion script for docker exec
2017-12-14 14:33:04 -08:00
Sebastiaan van Stijn 1a21ca12a6
Updated deprecation status for "repository:shortid"
The `repository:shortid` syntax for referencing images is very little used,
collides with with tag references can be confused with digest references.

The `repository:shortid` notation was deprecated in Docker 1.13, and scheduled
for removal in Docker 17.12.

This patch updates the deprecation status for this feature.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-12-14 14:23:17 -08:00
Sebastiaan van Stijn 1d54f30cbb
Merge pull request #754 from thaJeztah/fix-on-failure
Fix "on-failure" restart policy being documented as "failure"
2017-12-14 14:20:43 -08:00
Sebastiaan van Stijn 43217d7332
Fix "on-failure" restart policy being documented as "failure"
Commit ddadd3db49 refactored
the markdown documentation, but accidentally changed
`on-failure` to `failure`.

This patch corrects this change.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-12-14 13:50:56 -08:00
Sebastiaan van Stijn 6a2b9d0267
Merge pull request #748 from thaJeztah/fix-storage-driver-anchors
Fix anchors to "Storage driver options"
2017-12-13 09:53:05 -08:00
ktrysmt db05d8ad79 Fixed #750
Signed-off-by: Kotaro Yoshimatsu <kotaro.yoshimatsu@gmail.com>
2017-12-13 17:45:14 +09:00
Sebastiaan van Stijn 619c40fac5
Merge pull request #747 from thaJeztah/17.12-update-deprecated
Update docs and completion-scripts for deprecated features
2017-12-13 00:02:26 -08:00
Sebastiaan van Stijn 29ae8cf0e0
Merge pull request #746 from lachlancooper/master
Correct references to --publish long syntax in docs
2017-12-12 17:31:09 -08:00
Sebastiaan van Stijn 630f8b1254
Fix anchors to "Storage driver options"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-12-12 17:27:05 -08:00
Sebastiaan van Stijn a119e39f0c
Update docs and completion-scripts for deprecated features
- the `--disable-legacy-registry` daemon flag was removed
- duplicate keys with conflicting values for engine labels
  now produce an error instead of a warning.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-12-12 17:09:38 -08:00
Lachlan Cooper 90f44e564b
Correct references to --publish long syntax in docs
This is the same issue as described at docker/docker.github.io#5370

Signed-off-by: Lachlan Cooper <lachlancooper@gmail.com>
2017-12-13 10:25:43 +11:00
Sebastiaan van Stijn eb5e32e78c
Merge pull request #743 from dnephin/compose-add-name-to-network
Fix external networks in stacks
2017-12-11 19:26:55 -08:00
Daniel Nephin 9da2602f38 Fix external networks
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-12-11 11:29:49 -05:00
Vincent Demeester 29d3510d50
Merge pull request #741 from thaJeztah/bump-version
Bump version to 18.01-dev
2017-12-08 09:04:04 +01:00
Sebastiaan van Stijn c4875264a3
Bump version to 18.01-dev
The 17.12.0-rc1 release was cut-off from commit
ace5417954

This patch bumps the version to 18.01-dev to
indicate that any change is now for the upcoming
18.01 release.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-12-07 13:58:06 -08:00