Tibor Vass
aecdb056f0
Merge pull request #1276 from tiborvass/buildkit-progress-flag
...
build: change --console=[auto,false,true] to --progress=[auto,plain,tty]
Upstream-commit: 964173997d
2018-08-15 20:42:47 -07:00
Brian Goff
a46d6924fa
Merge pull request #1014 from AkihiroSuda/connhelper-sshonly
...
support SSH connection
Upstream-commit: e92614a175
2018-08-14 15:12:06 -07:00
Sebastiaan van Stijn
d8d0aaab1d
Merge pull request #1284 from adshmh/refactor-stack-ps-tests
...
refactor stack ps tests
Upstream-commit: 4d4392ba04
2018-08-14 18:59:56 +02:00
Arash Deshmeh
0b69793ee3
refactor stack ps tests to table-driven
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 340e4ee8e5
2018-08-10 15:13:45 -04:00
Silvin
70a91dd01b
Merge pull request #1283 from adshmh/refactor-trust-revoke-tests
...
refactor trust revoke command unit tests
Upstream-commit: 3a3e720f91
2018-08-10 11:03:58 +02:00
Vincent Demeester
e3e25812ec
Merge pull request #1280 from adshmh/refactor-trust-inspect-tests
...
refactor trust inspect command unit tests
Upstream-commit: 560b0cd863
2018-08-10 10:37:53 +02:00
Arash Deshmeh
ea09ac3378
refactored trust revoke command unit tests to use table-driven style
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 984d76b9dd
2018-08-09 15:58:54 -04:00
Sebastiaan van Stijn
e2e1350a4c
Merge pull request #1266 from adshmh/use-natural-sort-order-for-network-list
...
use sortorder library for sorting network list output
Upstream-commit: 6ef11c516d
2018-08-09 12:05:55 +02:00
Arash Deshmeh
64bf68b122
refactor trust inspect command unit tests to table-driven style
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: f8f0d72cf9
2018-08-08 13:50:00 -04:00
Arash Deshmeh
7435e1c862
use sortorder lib for sorting the output of volume list command
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 5cc1f9006a
2018-08-08 12:20:21 -04:00
Arash Deshmeh
73b3c56c30
use sortorder lib for sorting in trust package
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 04bb3c770f
2018-08-08 12:20:10 -04:00
Arash Deshmeh
21c2c41660
use sortorder lib for sorting network list output
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: a921313caf
2018-08-08 12:06:59 -04:00
Tibor Vass
9e965fad85
build: change --console=[auto,false,true] to --progress=[auto,plain,tty]
...
This changes the experimental --console flag to --progress following
feedback indicating avoidable confusion.
In addition to naming changes, the help output now has an additional
clarification, specifically: container output during builds are only
shown when progress output is set to plain. Not mentioning this was also
a big cause of confusion.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: faeb8bb571
2018-08-07 18:18:13 +00:00
Sebastiaan van Stijn
d098202034
Merge pull request #1277 from vdemeester/template-subtests-followup
...
Migrate `TestExtractVariables` to subtests…
Upstream-commit: 1d04f7d66b
2018-08-07 16:30:11 +02:00
Vincent Demeester
68e01b8ab7
Migrate TestExtractVariables to subtests…
...
… as suggested in previous PR comment.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 9cd7c1361c
2018-08-07 16:06:13 +02:00
Sebastiaan van Stijn
c213d85ec3
Merge pull request #1271 from albers/completion-shellcheck
...
Fix shellcheck warnings
Upstream-commit: b5768bea9b
2018-08-04 01:36:36 +02:00
Sebastiaan van Stijn
6d14e4f6a2
Merge pull request #1269 from albers/completion-cp--archive
...
Add bash completion for `cp --archive`
Upstream-commit: e8cd06c8eb
2018-08-03 23:48:52 +02:00
Harald Albers
22b9c5ed2c
Merge pull request #1270 from Ace-Tang/master
...
bash completion: fix uncorrect completion
Upstream-commit: ad28cec012
2018-08-03 23:26:09 +02:00
Harald Albers
73443cfafe
Fix shellcheck warnings
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: e587ec293b
2018-08-03 15:28:09 +02:00
Ace-Tang
1dfbd7519a
bash completion: fix uncorrect completion
...
fix uncorrect completion for command
docker docker <tab>
Signed-off-by: Ace-Tang <aceapril@126.com >
Upstream-commit: 7b4e2f3145
2018-08-03 21:27:27 +08:00
Harald Albers
13b26eee62
Add bash completion for cp --archive
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: b9b3754ad3
2018-08-03 14:30:30 +02:00
Sebastiaan van Stijn
f92453678a
Merge pull request #1259 from adshmh/add-unit-test-to-cover-network-list-sort
...
Add unit test to cover network list sort, refactor to table-driven tests
Upstream-commit: e902ae9f84
2018-08-02 20:28:53 +02:00
Arash Deshmeh
115f23480e
refactor network list unit tests to table-driven style
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 021bf39d76
2018-08-02 14:07:06 -04:00
Arash Deshmeh
d4fe2b6044
add unit test to cover the sort order of network list command
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 4f388ffca3
2018-08-02 14:07:06 -04:00
Sebastiaan van Stijn
a727cc8ee8
Merge pull request #1262 from vdemeester/allow-custom-pattern
...
Allow custom pattern when extracting variable…
Upstream-commit: ff1a34d9a9
2018-08-02 18:00:38 +02:00
Sebastiaan van Stijn
c1168064aa
Merge pull request #1254 from albers/completion-kubernetes
...
Add bash completion for kubernetes orchestrator
Upstream-commit: 731b4f1fb4
2018-08-02 17:30:31 +02:00
Vincent Demeester
4cbdb398d7
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 >
Upstream-commit: 4c87725c35
2018-08-02 16:50:40 +02:00
Harald Albers
841a592280
Add bash completion for kubernetes orchestrator
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 08f8ee1320
2018-08-02 13:54:31 +02:00
Harald Albers
907c1bdfa8
Only complete swarm specific options with orchestrator=swarm
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 8ef01e869e
2018-08-02 13:54:31 +02:00
Harald Albers
19734fb410
Add support for orchestrator specific bash completions
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: ff953751d3
2018-08-02 13:54:31 +02:00
Sebastiaan van Stijn
5f6d6806ac
Merge pull request #1251 from silvin-lubecki/fix-stack-help-command
...
Fix help message flags on docker stack commands and sub-commands
Upstream-commit: 4fbb009d39
2018-08-02 13:10:36 +02:00
Akihiro Suda
4a36f11243
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 >
Upstream-commit: 6f61cf053a
2018-08-02 13:10:06 +09:00
Silvin
ed3a613040
Merge pull request #1258 from wyckster/patch-2
...
Fixed wrong apostrophe character
Upstream-commit: 261ff66d61
2018-08-01 18:09:36 +02:00
wyckster
691f30bc72
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 >
Upstream-commit: b59823c784
2018-08-01 11:06:07 -04:00
Vincent Demeester
52c1a41d81
Merge pull request #1249 from vdemeester/compose-template-pkg-enhancement
...
Add a new `ExtractVariables` function to `compose/template` package
Upstream-commit: da544e8938
2018-08-01 16:18:46 +02:00
Vincent Demeester
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
2018-08-01 16:12:49 +02:00
Vincent Demeester
6951f936e1
Merge pull request #1256 from silvin-lubecki/update-reviewers
...
Remove outdated completion reviewers file
Upstream-commit: 2093fd6e52
2018-08-01 15:19:36 +02:00
Silvin Lubecki
d180792961
Remove outdated completion reviewers file
...
Clean maintainers and code owners files
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: 9022a00fbe
2018-08-01 15:08:36 +02:00
Silvin Lubecki
ba693dc4c7
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 >
Upstream-commit: 21cce52b30
2018-08-01 01:48:27 +02:00
Sebastiaan van Stijn
42c10fc02b
Merge pull request #1215 from albers/completion-service-logs-options
...
Add bash completion for `service logs --details|--raw`
Upstream-commit: 08f5f52cdc
2018-07-31 22:25:36 +02:00
Brian Goff
f13fff9319
Merge pull request #1246 from vdemeester/bump-mergo
...
Bump mergo to v0.3.6
Upstream-commit: 24b7effa30
2018-07-31 10:59:41 -07:00
Silvin
99b63333cb
Merge pull request #1248 from marcov/add-help-target
...
Add `help` and remove `watch` targets in docker.Makefile
Upstream-commit: 74071f2347
2018-07-31 16:52:07 +02:00
Marco Vedovati
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 c0588a9cmvedovati@suse.com >
Upstream-commit: 760ca04709
2018-07-31 14:38:51 +02:00
Vincent Demeester
2514c7af88
Merge pull request #1247 from marcov/make-help
...
Allow running `make help` without out-of-container warning
Upstream-commit: 7f853fee87
2018-07-31 14:04:10 +02:00
Marco Vedovati
04c5e8c6df
Allow running make help without out-of-container warning
...
Signed-off-by: Marco Vedovati <mvedovati@suse.com >
Upstream-commit: 265dec037b
2018-07-31 10:56:48 +02:00
Vincent Demeester
a87b47f24d
Merge pull request #1242 from cyphar/buildmode-pie
...
build: add -buildmode=pie
Upstream-commit: 40650cfbd5
2018-07-31 10:09:11 +02:00
Vincent Demeester
89febef540
Bump mergo to v0.3.6
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 1f1507b0a4
2018-07-31 09:57:56 +02:00
Sebastiaan van Stijn
1f48874f14
Merge pull request #1244 from vdemeester/expose-compose-transform
...
Exposes compose `loader.Transform` function…
Upstream-commit: 70d5cb0dd0
2018-07-31 09:43:13 +02:00
Vincent Demeester
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
2018-07-31 09:37:09 +02:00
Sebastiaan van Stijn
a013875ea3
Merge pull request #1230 from vdemeester/update-k8s-and-other-deps
...
Update k8s and other deps
Upstream-commit: b4e50635a2
2018-07-30 17:49:11 +02:00
Tibor Vass
Brian Goff
Sebastiaan van Stijn
Arash Deshmeh
Silvin
Vincent Demeester
Tibor Vass
Vincent Demeester
Harald Albers
Harald Albers
Ace-Tang
Akihiro Suda
wyckster
Silvin Lubecki
Marco Vedovati