Vincent Demeester
58cb4233e4
Merge pull request #1175 from vdemeester/bump-k8s
...
Bump kubernetes dependencies to 1.8.14
Upstream-commit: f5393c904a
Component: cli
2018-07-02 17:12:35 +02:00
Vincent Demeester
f3c0910062
Bump kubernetes dependencies to 1.8.14
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b59c41b2a7
Component: cli
2018-07-02 16:32:07 +02:00
Sebastiaan van Stijn
13348b3c97
Merge pull request #1172 from vdemeester/no-need-to-check-files
...
Remove composefiles length check on k8s RunDeploy
Upstream-commit: 95a9b4d5fe
Component: cli
2018-07-02 15:06:50 +02:00
Vincent Demeester
779f6f7f88
Remove composefiles lenght check on k8s RunDeploy..
...
The compose file(s) are already loaded at that point.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 847e0c22d4
Component: cli
2018-07-02 15:00:19 +02:00
Sebastiaan van Stijn
a01b362aaa
Merge pull request #1171 from silvin-lubecki/fix-doc-typo
...
Fix Format example typo"
Upstream-commit: a2b4d30cd0
Component: cli
2018-07-02 14:47:39 +02:00
Silvin Lubecki
15af5c3d50
Fixing issue #1167 "Format example typo"
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: d0ddf91539
Component: cli
2018-07-02 14:21:10 +02:00
Silvin
d6559c14df
Merge pull request #1170 from vdemeester/omit-silvin
...
Add omitempty on compose config top-level types
Upstream-commit: 18091ea7e2
Component: cli
2018-07-02 14:16:53 +02:00
Vincent Demeester
8d5faaab34
Add omitempty on compose config top-level types
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: f05ab2b1fb
Component: cli
2018-07-02 12:04:09 +02:00
Vincent Demeester
88306c7201
Merge pull request #1169 from silvin-lubecki/schema-vendoring
...
Add a doc.go file so the compose/schema/data directory can be vendore…
Upstream-commit: 981c099b96
Component: cli
2018-07-02 10:47:25 +02:00
Sebastiaan van Stijn
f23d411358
Merge pull request #1168 from vdemeester/update-testing
...
Update TESTING.md to replace testify by gotest.tools
Upstream-commit: 1c69e83034
Component: cli
2018-07-02 10:34:28 +02:00
Silvin Lubecki
dbc964790c
Add a doc.go file so the compose/schema/data directory can be vendored in another project, without being pruned.
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: 3a8ef767f8
Component: cli
2018-07-02 10:08:25 +02:00
Vincent Demeester
82ffaa807c
Merge pull request #1160 from euank/simpler-pass
...
config/credentials: don't run 'pass' to detect it
Upstream-commit: 9e36ff4491
Component: cli
2018-07-02 09:40:47 +02:00
Vincent Demeester
2d117d02fc
Update TESTING.md to replace testify by gotest.tools
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 057bf6f4d1
Component: cli
2018-07-02 09:24:28 +02:00
Sebastiaan van Stijn
449c60abf1
Merge pull request #1157 from AzureCR/master
...
Updated the go-winio library to release 0.4.8 that has the fix for Windows Container
Upstream-commit: 34ba66b0c5
Component: cli
2018-06-29 21:11:53 +02:00
Euan Kemp
a4509c02c7
config/credentials: don't run 'pass' to detect it
...
'CheckInitialized' in the credential-helper library actually invokes
`pass`, which isn't desirable (see #699 ).
This moves the check to be simpler, and then pass will only be invoked
when it's needed (such as for `docker login` or when pulling from a
private registry).
This logic could also reasonably live in the credential-helper library,
but it's simple enough it seems fine in either location.
Signed-off-by: Euan Kemp <euank@euank.com >
Upstream-commit: 056015c3d8
Component: cli
2018-06-29 11:38:39 -07:00
Tejaswini Duggaraju
00a2e2286e
Updated the go-winio library to release 0.4.8 that has the fix for Windows containers
...
Signed-off-by: Tejaswini Duggaraju <naduggar@microsoft.com >
Upstream-commit: c98c4080a3
Component: cli
2018-06-29 10:49:52 -07:00
Sebastiaan van Stijn
871e21254e
Merge pull request #1145 from Vimal-Raghubir/590-Add-missing-option
...
Add: Add missing option
Upstream-commit: da59ccb601
Component: cli
2018-06-29 17:16:25 +02:00
Vincent Demeester
a60dc52c9f
Merge pull request #1155 from adshmh/add-unit-tests-to-plugin-list
...
added unit tests to cover plugin list command
Upstream-commit: 9faf728089
Component: cli
2018-06-29 15:49:30 +02:00
Sebastiaan van Stijn
f354e71da3
Merge pull request #1152 from vdemeester/extract-converter
...
Extract StackConverter from the StackClient
Upstream-commit: 7c7c299eee
Component: cli
2018-06-29 13:36:55 +02:00
Sebastiaan van Stijn
74cbabea8f
Merge pull request #1158 from albers/completion-dockerd--default-address-pool
...
Add bash completion for `dockerd --default-address-pool`
Upstream-commit: 3991b2fae3
Component: cli
2018-06-29 11:48:43 +02:00
Sebastiaan van Stijn
90d240e1f6
Merge pull request #1159 from albers/completion-events-exec_die
...
Add bash completion for `exec_die` event
Upstream-commit: fe7ec42566
Component: cli
2018-06-29 11:47:58 +02:00
Harald Albers
312f1fe0aa
Add bash completion for exec_die event
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 8443982188
Component: cli
2018-06-29 11:20:23 +02:00
Harald Albers
ee38cae4b8
Add bash completion for dockerd --default-address-pool
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 0e6d9dfe85
Component: cli
2018-06-29 11:11:24 +02:00
Arash Deshmeh
b31e4cd2ef
added unit tests to cover plugin list command
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: c26121df5c
Component: cli
2018-06-28 16:51:54 -04:00
Vincent Demeester
06b2959259
Merge pull request #1154 from thaJeztah/bump_version_18.07_dev
...
Bump version to 18.07.0-dev
Upstream-commit: ea65e9043c
Component: cli
2018-06-28 16:24:08 +02:00
Sebastiaan van Stijn
644d6fd60f
Bump version to 18.07.0-dev
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f1fa1f3f15
Component: cli
2018-06-28 15:44:15 +02:00
Vincent Demeester
4efabde589
Merge pull request #1151 from vdemeester/update-docker-credential-helper-pass
...
Update docker-credential-helpers dependency
Upstream-commit: 293553944d
Component: cli
2018-06-28 14:57:05 +02:00
Vincent Demeester
539051208f
Update docker-credential-helpers dependency
...
This is mainly for the `pass` helper ; `pass` shouldn't be called
every docker command anymore ;).
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: d9741fc96b
Component: cli
2018-06-28 14:44:53 +02:00
Vincent Demeester
23acff6a45
Merge pull request #1149 from adshmh/add-unit-tests-to-plugin-install
...
added unit tests covering content trust for plugin install command
Upstream-commit: b21f9dde61
Component: cli
2018-06-28 09:28:18 +02:00
Arash Deshmeh
efa9f9914b
added unit tests covering content trust for plugin install command
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: bc9b42ea9b
Component: cli
2018-06-27 22:16:19 -04:00
Vincent Demeester
9152b94149
Extract StackConverter from the StackClient
...
It makes it easier to get the correct stack from a compose config
struct without requiring the client (and thus talking to k8s API)
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: f2e6ee6899
Component: cli
2018-06-27 16:41:00 +02:00
Vimal Raghubir
5be6ded435
Add: Add missing option
...
Signed-off-by: Vimal-Raghubir <vraghubir0418@gmail.com >
Upstream-commit: a205aecb80
Component: cli
2018-06-26 22:20:01 -04:00
Silvin
d11d5a93ae
Merge pull request #1128 from vdemeester/interpolation-options
...
Add options to the compose loader
Upstream-commit: 204ab4ca74
Component: cli
2018-06-26 15:05:54 +02:00
Silvin
06ae3da352
Merge pull request #1147 from vdemeester/stack-refactoring
...
Refactor `stack` command/package
Upstream-commit: ae1618713f
Component: cli
2018-06-26 15:00:17 +02:00
Vincent Demeester
1821b4879d
Refactor stack command/package
...
- Handle `bundlefile` directly in the `top-level`
command. `bundlefile` is still experimental and will be deprecated
in future version — this should make be easier to remove it.
- Validate the `stack` name in all cases (i.e. whatever the
orchestrator is used)
- Load the composefile ahead of choosing the orchestrator. This
removes some slight duplication.
- Makes `RunDeploy` easier to use from outside packages (like
`docker/app`) with a preloaded configuration.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 0f9d24f78d
Component: cli
2018-06-26 14:07:26 +02:00
Vincent Demeester
e9bc5ab185
Add options to the compose loader
...
- Add the possibility to skip interpolation
- Add the possibility to skip schema validation
- Allow customizing the substitution function, to add special cases.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 9fdd14f399
Component: cli
2018-06-25 17:15:26 +02:00
Sebastiaan van Stijn
fad2548681
Merge pull request #1138 from seemethere/env_experimental
...
Add env variable option for experimental
Upstream-commit: 61e53fc88a
Component: cli
2018-06-25 14:47:16 +02:00
Silvin
dcf4767db4
Merge pull request #1129 from vdemeester/init-in-composefile
...
Add `init` support in 3.7 schema
Upstream-commit: 0f6936d557
Component: cli
2018-06-25 11:18:20 +02:00
Silvin Lubecki
bd5f8ff9d8
Refactor tests
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: 38056740d6
Component: cli
2018-06-25 11:13:32 +02:00
Vincent Demeester
ee21c8c224
Add init support in 3.7 schema
...
> Run an init inside the container that forwards signals and reaps
processes
This is supported on `run` and now on Swarm services too, so it's also
possible to have in on a composefile :).
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: cc26da94ed
Component: cli
2018-06-25 11:13:32 +02:00
Vincent Demeester
c882d0eb09
Merge pull request #1126 from vdemeester/extra-extras
...
Add an `Extras` field on the compose config types.
Upstream-commit: e529043c51
Component: cli
2018-06-25 10:58:50 +02:00
Vincent Demeester
27e77fdcd7
Add an Extras field on the compose config types.
...
That field is automaticaly populated with any `x-*` field in the yaml.
And marshalling the compose config struct put them back into place.
This make it possible to get those extra fields without re-inventing
the wheel (i.e. reimplementing 80% of the `cli/compose/*` packages.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 80c26f618e
Component: cli
2018-06-25 10:51:56 +02:00
Eli Uriegas
138db9c689
Add env variable option for experimental
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: e3bb62ed51
Component: cli
2018-06-24 21:15:02 +00:00
Vincent Demeester
2bd0b7012e
Merge pull request #1141 from adshmh/fix-output-leak-from-TestRunCommandWithContentTrustErrors
...
fixed output leak from TestRunCommandWithContentTrustErrors
Upstream-commit: 1c20e3f601
Component: cli
2018-06-24 09:20:56 +02:00
Arash Deshmeh
003f07b295
fixed output leak from TestRunCommandWithContentTrustErrors unit tests
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: d469cbdd14
Component: cli
2018-06-23 10:27:27 -04:00
Silvin
4681fad5b4
Merge pull request #1139 from thaJeztah/add_orchestrator_warning
...
Warn if DOCKER_ORCHESTRATOR is still used but not DOCKER_STACK_ORCHESTRATOR
Upstream-commit: cc9495ac89
Component: cli
2018-06-23 14:33:28 +02:00
Silvin Lubecki
666c87bcf4
Warn if DOCKER_ORCHESTRATOR is still used but not DOCKER_STACK_ORCHESTRATOR
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: e8c87f7cb3
Component: cli
2018-06-22 13:58:39 -07:00
Sebastiaan van Stijn
a0daba149d
Remove duplicated getOrchestrator(), and rename hideFlag()
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: e02c28f40a
Component: cli
2018-06-22 13:58:14 -07:00
Andrew Hsu
4ba3dc6e89
Merge pull request #1137 from silvin-lubecki/stack-orchestrator
...
Fix broken swarm commands with Kubernetes defined as orchestrator
Upstream-commit: 151990de62
Component: cli
2018-06-22 13:56:42 -07:00
Sebastiaan van Stijn
763b3149b8
Remove shorthand -k option from docker version
...
The `-k` shorthand was alreaady removed from other
commands, so best to be consistent.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f0a8598b8d
Component: cli
2018-06-21 23:33:55 -07:00