Commit Graph

5990 Commits

Author SHA1 Message Date
Sebastiaan van Stijn ff1a34d9a9
Merge pull request #1262 from vdemeester/allow-custom-pattern
Allow custom pattern when extracting variable…
2018-08-02 18:00:38 +02:00
Sebastiaan van Stijn 731b4f1fb4
Merge pull request #1254 from albers/completion-kubernetes
Add bash completion for kubernetes orchestrator
2018-08-02 17:30:31 +02:00
Vincent Demeester 4c87725c35
Allow custom pattern when extracting variable…
… as it is possible to do it when interpolating. It also fixes when
there is 2 variables on the same *value* (in the composefile, on the
same line)

Finaly, renaming the default, used in cli, pattern to `defaultPattern`
to not be shadowed unintentionally.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-08-02 16:50:40 +02:00
Harald Albers 08f8ee1320 Add bash completion for kubernetes orchestrator
Signed-off-by: Harald Albers <github@albersweb.de>
2018-08-02 13:54:31 +02:00
Harald Albers 8ef01e869e Only complete swarm specific options with orchestrator=swarm
Signed-off-by: Harald Albers <github@albersweb.de>
2018-08-02 13:54:31 +02:00
Harald Albers ff953751d3 Add support for orchestrator specific bash completions
Signed-off-by: Harald Albers <github@albersweb.de>
2018-08-02 13:54:31 +02:00
Sebastiaan van Stijn 4fbb009d39
Merge pull request #1251 from silvin-lubecki/fix-stack-help-command
Fix help message flags on docker stack commands and sub-commands
2018-08-02 13:10:36 +02:00
Akihiro Suda 6f61cf053a support SSH connection
e.g. docker -H ssh://me@server

The `docker` CLI also needs to be installed on the remote host to
provide `docker system dial-stdio`, which proxies the daemon socket to stdio.

Please refer to docs/reference/commandline/dockerd.md .

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-08-02 13:10:06 +09:00
Silvin 261ff66d61
Merge pull request #1258 from wyckster/patch-2
Fixed wrong apostrophe character
2018-08-01 18:09:36 +02:00
wyckster b59823c784
Fixed wrong apostrophe character
Changed unexpected Unicode character 0x1fbf GREEK PSILI that was standing in as an imposter for an apostrophe:  an _impostrophe_.

Signed-off-by: Chad Faragher <wyckster@hotmail.com>
2018-08-01 11:06:07 -04:00
Vincent Demeester da544e8938
Merge pull request #1249 from vdemeester/compose-template-pkg-enhancement
Add a new `ExtractVariables` function to `compose/template` package
2018-08-01 16:18:46 +02:00
Vincent Demeester afb87e42f2
Add a new `ExtractVariables` function to `compose/template` package
It allows to get easily all the variables defined in a
composefile (the `map[string]interface{}` representation that
`loader.ParseYAML` returns at least) and their default value too.

This commit also does some small function extract on substitution
funcs to reduce a tiny bit duplication.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-08-01 16:12:49 +02:00
Vincent Demeester 2093fd6e52
Merge pull request #1256 from silvin-lubecki/update-reviewers
Remove outdated completion reviewers file
2018-08-01 15:19:36 +02:00
Silvin Lubecki 9022a00fbe Remove outdated completion reviewers file
Clean maintainers and code owners files

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
2018-08-01 15:08:36 +02:00
Silvin Lubecki 21cce52b30 Fix help message flags on docker stack commands and sub-commands
PersistentPreRunE needs to be called within the help function to initialize all the flags (notably the orchestrator flag)
Add an e2e test as regression test

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
2018-08-01 01:48:27 +02:00
Sebastiaan van Stijn 08f5f52cdc
Merge pull request #1215 from albers/completion-service-logs-options
Add bash completion for `service logs --details|--raw`
2018-07-31 22:25:36 +02:00
Brian Goff 24b7effa30
Merge pull request #1246 from vdemeester/bump-mergo
Bump mergo to v0.3.6
2018-07-31 10:59:41 -07:00
Silvin 74071f2347
Merge pull request #1248 from marcov/add-help-target
Add `help` and remove `watch` targets in docker.Makefile
2018-07-31 16:52:07 +02:00
Marco Vedovati 760ca04709 Add `help` and remove `watch` targets in docker.Makefile
* Add the `help` target to document make targets when building using a
container
* Remove the `watch` target (filewatcher was removed with c0588a9c) from
docker.Makefile and Makefile

Signed-off-by: Marco Vedovati <mvedovati@suse.com>
2018-07-31 14:38:51 +02:00
Vincent Demeester 7f853fee87
Merge pull request #1247 from marcov/make-help
Allow running `make help` without out-of-container warning
2018-07-31 14:04:10 +02:00
Marco Vedovati 265dec037b Allow running `make help` without out-of-container warning
Signed-off-by: Marco Vedovati <mvedovati@suse.com>
2018-07-31 10:56:48 +02:00
Vincent Demeester 40650cfbd5
Merge pull request #1242 from cyphar/buildmode-pie
build: add -buildmode=pie
2018-07-31 10:09:11 +02:00
Vincent Demeester 1f1507b0a4
Bump mergo to v0.3.6
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-07-31 09:57:56 +02:00
Sebastiaan van Stijn 70d5cb0dd0
Merge pull request #1244 from vdemeester/expose-compose-transform
Exposes compose `loader.Transform` function…
2018-07-31 09:43:13 +02:00
Vincent Demeester 0246bc1b3b
Exposes compose `loader.Transform` function…
This should make it easier for people to write custom composefile
parser without duplicating too much code. It takes the default
transformers and any additional number of transformer for any
types. That way it's possible to transform a `cli/compose` map into a
custom type that would use some of `cli/compose` types and its own.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-07-31 09:37:09 +02:00
Sebastiaan van Stijn b4e50635a2
Merge pull request #1230 from vdemeester/update-k8s-and-other-deps
Update k8s and other deps
2018-07-30 17:49:11 +02:00
Vincent Demeester 19653e7fad
Merge pull request #1240 from thaJeztah/datapath_addr_api_annotation
Add API-version anotation for --data-path-addr
2018-07-30 17:47:52 +02:00
Silvin 6cd0e2fe70
Merge pull request #1222 from thaJeztah/its_not_standard_but_its_in
Update --compose-file flag description to mention stdin
2018-07-30 16:23:29 +02:00
Vincent Demeester fffec04374
Re-order vendor.conf alphabeticaly
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-07-30 16:14:52 +02:00
Sebastiaan van Stijn ed335aba8c
Merge pull request #990 from vdemeester/e2e-iddfile-from-moby
Import TestBuildIidFileSquash from moby to cli
2018-07-30 11:37:36 +02:00
Aleksa Sarai 164e812b7a
build: add -buildmode=pie
Make all dynbinary builds be position-independent (this adds both
security benefits and can help with flaky builds on POWER
architectures).

Signed-off-by: Aleksa Sarai <asarai@suse.de>
2018-07-30 19:34:01 +10:00
Sebastiaan van Stijn 91b1ad9d2b
Add API-version anotation for --data-path-addr
This flag was added in Docker 17.06, API version 1.31 through
moby@8dc8cd4719f165c01c98e7d3ce1d6cea6a8f60b8, but didn't add
API-version annotations.

This patch adds the missing annotations to hide this flag if
the CLI is connected to an older version of the daemon that
doesn't support that API.

Before this patch:

    DOCKER_API_VERSION=1.30 docker swarm init --help | grep data-path-addr
          --data-path-addr string           Address or interface to use for data path traffic (format: <ip|interface>)

    DOCKER_API_VERSION=1.31 docker swarm init --help | grep data-path-addr
          --data-path-addr string           Address or interface to use for data path traffic (format: <ip|interface>)

With this patch applied:

    DOCKER_API_VERSION=1.30 docker swarm init --help | grep data-path-addr
    # (no result)

    DOCKER_API_VERSION=1.31 docker swarm init --help | grep data-path-addr
          --data-path-addr string           Address or interface to use for data path traffic (format: <ip|interface>)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-07-30 11:05:20 +02:00
Vincent Demeester edfd623594
Merge pull request #1237 from vdemeester/use-non-deprecated-filters-funcs
Migrate to non-deprecated functions of `api/types/filters`
2018-07-27 14:47:01 +00:00
Vincent Demeester 55edeb497a
Migrate to non-deprecated functions of `api/types/filters`
- Use `Contains` instead of `Include`
- Use `ToJSON` instead of `ToParam`
- Remove usage of `ParseFlag` as it is deprecated too

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-07-27 15:37:43 +02:00
Vincent Demeester a3464c0a20
Merge pull request #1140 from Vimal-Raghubir/1110-Fix-Warning-Message
Fix: Warning Message and Fallback search
2018-07-27 07:27:00 +00:00
Vincent Demeester b3b2ace735
Merge pull request #1235 from vdemeester/compose-add-missing-field
Add missing fields in compose/types
2018-07-26 15:20:42 +00:00
Vincent Demeester d13e2df65b
Add missing fields in compose/types
Even though those fields are not supported by `docker stack deploy`
they are defined in versions `3.x` of compose schema, so the `compose`
package should be able to marshal/unmarshal them.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-07-26 17:04:22 +02:00
Silvin effe36a155
Merge pull request #1232 from tommilligan/1231-zsh-autocomplete-update-invalid
Fixed typo breaking zsh docker update autocomplete (closes #1231)
2018-07-25 14:17:57 +02:00
Vincent Demeester 8788a4804f
Bump some dependencies to more recent versions (and tagged if available)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-07-25 14:16:41 +02:00
Tom Milligan da00d1c49f Fixed typo breaking zsh docker update autocomplete
Signed-off-by: Tom Milligan <tommilligan@users.noreply.github.com>
2018-07-25 12:23:08 +01:00
Vincent Demeester c8f0e211b9
Bump kubernetes dependencies to 1.11
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-07-25 11:34:59 +02:00
Sebastiaan van Stijn 601131634e
Merge pull request #1227 from pszczekutowicz/master
Added events filter scope for bash and zsh completion
2018-07-22 22:33:25 +02:00
Paweł Szczekutowicz 13db1bc95f Added events filter scope zsh completion
Signed-off-by: Paweł Szczekutowicz <pszczekutowicz@gmail.com>
2018-07-20 15:47:00 +02:00
Paweł Szczekutowicz c922ea2f45 Added events filter scope bash completion
Signed-off-by: Paweł Szczekutowicz <pszczekutowicz@gmail.com>
2018-07-20 15:37:49 +02:00
Sebastiaan van Stijn 543d6fb8da
Merge pull request #1226 from thaJeztah/harder_better_slower_stronger
Bump version to 18.09.0-dev
2018-07-20 10:30:41 +02:00
Sebastiaan van Stijn 7fba38acad
Bump version to 18.09.0-dev
Releases will be supported for a longer term, and
will be done on a 6-month(ish) cycle.

https://blog.docker.com/2018/07/extending-support-cycle-docker-community-edition/

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-07-20 10:14:32 +02:00
Sebastiaan van Stijn 2c7822b036
Update --compose-file flag description to mention stdin
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-07-19 14:55:48 +02:00
Sebastiaan van Stijn 48fbb12b7c
Merge pull request #1216 from justyntemme/patch-4
Update deploy.go
2018-07-17 16:20:46 +02:00
Justyn Temme bdd58a4096 Update deploy.go
Clarified ambiguous error message

Update kubernetes/cli.go

Infromed user of why the error was caused when file is not there

Signed-off-by: Justyn Temme <justyntemme@gmail.com>
2018-07-17 09:14:05 -05:00
Harald Albers 4912846de2 Add bash completion for `service logs --details|--raw`
Signed-off-by: Harald Albers <github@albersweb.de>
2018-07-16 18:46:06 +02:00