Commit Graph

5528 Commits

Author SHA1 Message Date
52c1a41d81 Merge pull request #1249 from vdemeester/compose-template-pkg-enhancement
Add a new `ExtractVariables` function to `compose/template` package
Upstream-commit: da544e8938
Component: cli
2018-08-01 16:18:46 +02:00
0bdf126d62 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>
Upstream-commit: afb87e42f2
Component: cli
2018-08-01 16:12:49 +02:00
6951f936e1 Merge pull request #1256 from silvin-lubecki/update-reviewers
Remove outdated completion reviewers file
Upstream-commit: 2093fd6e52
Component: cli
2018-08-01 15:19:36 +02:00
d180792961 Remove outdated completion reviewers file
Clean maintainers and code owners files

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
Upstream-commit: 9022a00fbe
Component: cli
2018-08-01 15:08:36 +02:00
42c10fc02b Merge pull request #1215 from albers/completion-service-logs-options
Add bash completion for `service logs --details|--raw`
Upstream-commit: 08f5f52cdc
Component: cli
2018-07-31 22:25:36 +02:00
f13fff9319 Merge pull request #1246 from vdemeester/bump-mergo
Bump mergo to v0.3.6
Upstream-commit: 24b7effa30
Component: cli
2018-07-31 10:59:41 -07:00
99b63333cb Merge pull request #1248 from marcov/add-help-target
Add `help` and remove `watch` targets in docker.Makefile
Upstream-commit: 74071f2347
Component: cli
2018-07-31 16:52:07 +02:00
eda72c01e5 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>
Upstream-commit: 760ca04709
Component: cli
2018-07-31 14:38:51 +02:00
2514c7af88 Merge pull request #1247 from marcov/make-help
Allow running `make help` without out-of-container warning
Upstream-commit: 7f853fee87
Component: cli
2018-07-31 14:04:10 +02:00
04c5e8c6df Allow running make help without out-of-container warning
Signed-off-by: Marco Vedovati <mvedovati@suse.com>
Upstream-commit: 265dec037b
Component: cli
2018-07-31 10:56:48 +02:00
a87b47f24d Merge pull request #1242 from cyphar/buildmode-pie
build: add -buildmode=pie
Upstream-commit: 40650cfbd5
Component: cli
2018-07-31 10:09:11 +02:00
89febef540 Bump mergo to v0.3.6
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 1f1507b0a4
Component: cli
2018-07-31 09:57:56 +02:00
1f48874f14 Merge pull request #1244 from vdemeester/expose-compose-transform
Exposes compose `loader.Transform` function…
Upstream-commit: 70d5cb0dd0
Component: cli
2018-07-31 09:43:13 +02:00
7ff97deeb6 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>
Upstream-commit: 0246bc1b3b
Component: cli
2018-07-31 09:37:09 +02:00
a013875ea3 Merge pull request #1230 from vdemeester/update-k8s-and-other-deps
Update k8s and other deps
Upstream-commit: b4e50635a2
Component: cli
2018-07-30 17:49:11 +02:00
499075c042 Merge pull request #1240 from thaJeztah/datapath_addr_api_annotation
Add API-version anotation for --data-path-addr
Upstream-commit: 19653e7fad
Component: cli
2018-07-30 17:47:52 +02:00
d5c619e6c1 Merge pull request #1222 from thaJeztah/its_not_standard_but_its_in
Update --compose-file flag description to mention stdin
Upstream-commit: 6cd0e2fe70
Component: cli
2018-07-30 16:23:29 +02:00
cb923e6307 Re-order vendor.conf alphabeticaly
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: fffec04374
Component: cli
2018-07-30 16:14:52 +02:00
6f7a62be58 Merge pull request #990 from vdemeester/e2e-iddfile-from-moby
Import TestBuildIidFileSquash from moby to cli
Upstream-commit: ed335aba8c
Component: cli
2018-07-30 11:37:36 +02:00
4a40f4d761 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>
Upstream-commit: 164e812b7a
Component: cli
2018-07-30 19:34:01 +10:00
6ec35e4b2d 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>
Upstream-commit: 91b1ad9d2b
Component: cli
2018-07-30 11:05:20 +02:00
d36e39d22c Merge pull request #1237 from vdemeester/use-non-deprecated-filters-funcs
Migrate to non-deprecated functions of `api/types/filters`
Upstream-commit: edfd623594
Component: cli
2018-07-27 14:47:01 +00:00
e74e974112 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>
Upstream-commit: 55edeb497a
Component: cli
2018-07-27 15:37:43 +02:00
5ff8cde8dc Merge pull request #1140 from Vimal-Raghubir/1110-Fix-Warning-Message
Fix: Warning Message and Fallback search
Upstream-commit: a3464c0a20
Component: cli
2018-07-27 07:27:00 +00:00
e905f40a10 Merge pull request #1235 from vdemeester/compose-add-missing-field
Add missing fields in compose/types
Upstream-commit: b3b2ace735
Component: cli
2018-07-26 15:20:42 +00:00
ce042f6ff4 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>
Upstream-commit: d13e2df65b
Component: cli
2018-07-26 17:04:22 +02:00
c76e6866ad Merge pull request #1232 from tommilligan/1231-zsh-autocomplete-update-invalid
Fixed typo breaking zsh docker update autocomplete (closes #1231)
Upstream-commit: effe36a155
Component: cli
2018-07-25 14:17:57 +02:00
e4c8ba34da Bump some dependencies to more recent versions (and tagged if available)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 8788a4804f
Component: cli
2018-07-25 14:16:41 +02:00
4c5f6c0dc0 Fixed typo breaking zsh docker update autocomplete
Signed-off-by: Tom Milligan <tommilligan@users.noreply.github.com>
Upstream-commit: da00d1c49f
Component: cli
2018-07-25 12:23:08 +01:00
f83ff2718a Bump kubernetes dependencies to 1.11
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: c8f0e211b9
Component: cli
2018-07-25 11:34:59 +02:00
9be707763d Merge pull request #1227 from pszczekutowicz/master
Added events filter scope for bash and zsh completion
Upstream-commit: 601131634e
Component: cli
2018-07-22 22:33:25 +02:00
e1ab6a31da Added events filter scope zsh completion
Signed-off-by: Paweł Szczekutowicz <pszczekutowicz@gmail.com>
Upstream-commit: 13db1bc95f
Component: cli
2018-07-20 15:47:00 +02:00
e91cf840e6 Added events filter scope bash completion
Signed-off-by: Paweł Szczekutowicz <pszczekutowicz@gmail.com>
Upstream-commit: c922ea2f45
Component: cli
2018-07-20 15:37:49 +02:00
957aa92a67 Merge pull request #1226 from thaJeztah/harder_better_slower_stronger
Bump version to 18.09.0-dev
Upstream-commit: 543d6fb8da
Component: cli
2018-07-20 10:30:41 +02:00
243d4a2f49 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>
Upstream-commit: 7fba38acad
Component: cli
2018-07-20 10:14:32 +02:00
08fd30fe8f Update --compose-file flag description to mention stdin
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2c7822b036
Component: cli
2018-07-19 14:55:48 +02:00
724ab95ba8 Merge pull request #1216 from justyntemme/patch-4
Update deploy.go
Upstream-commit: 48fbb12b7c
Component: cli
2018-07-17 16:20:46 +02:00
8dee127b92 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>
Upstream-commit: bdd58a4096
Component: cli
2018-07-17 09:14:05 -05:00
d384a456a6 Add bash completion for service logs --details|--raw
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 4912846de2
Component: cli
2018-07-16 18:46:06 +02:00
1d3ba53158 Merge pull request #1019 from ktomk/fix-env-file
import environment variables that are present
Upstream-commit: 9e71207327
Component: cli
2018-07-16 13:41:29 +02:00
df467b49b6 Merge pull request #1192 from peter-kehl/master
For docker/docker.github.io/issues/6987
Upstream-commit: 7b82276c88
Component: cli
2018-07-16 12:22:02 +02:00
95d9ce4032 Merge pull request #1212 from thaJeztah/bump_circleci_docker
Update CircleCI Docker version to 18.03
Upstream-commit: b395d2d6f5
Component: cli
2018-07-13 15:13:40 +02:00
de770aa887 Fix: Warning Message
Signed-off-by: Vimal-Raghubir <vraghubir0418@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ce3d069936
Component: cli
2018-07-13 13:39:24 +02:00
3980327921 Configure CircleCI remote daemon to use version 18.03.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 13eb2aa125
Component: cli
2018-07-13 11:51:41 +02:00
15f7e30815 Merge pull request #1208 from thaJeztah/update-linting
Update gometalinter to v2.0.6, remove nakedret
Upstream-commit: d57cc1782e
Component: cli
2018-07-13 11:41:59 +02:00
92fa05c733 Update CircleCI Docker version to 18.03
17.06 has reached EOL a long time ago; let's use a current
version in CI as well :D

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e2a56c47da
Component: cli
2018-07-13 11:26:07 +02:00
ca353ee7ae Update hints for linting
- remove some hints that are no longer needed
- added a nolint: unparam for removeSingleSigner() (return bool is only used in tests)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9847e96765
Component: cli
2018-07-13 11:18:50 +02:00
71a73ab18c Update gometalinter to v2.0.6 and remove alexkohler/nakedret
alexkohler/nakedret is now installed by default with gometalinter,
so it's no longer needed to install this manually

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f3811e865e
Component: cli
2018-07-13 11:17:43 +02:00
0388cb645f Merge pull request #1210 from albers/completion-service-create--init
Add bash completion for `service create|update --init`
Upstream-commit: d97f378009
Component: cli
2018-07-13 09:44:11 +02:00
526010074d Add bash completion for service create|update --init
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 97d312e02a
Component: cli
2018-07-13 09:05:29 +02:00