847e0c22d4
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>
2018-07-02 15:00:19 +02:00
a2b4d30cd0
Merge pull request #1171 from silvin-lubecki/fix-doc-typo
...
Fix Format example typo"
2018-07-02 14:47:39 +02:00
d0ddf91539
Fixing issue #1167 "Format example typo"
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
2018-07-02 14:21:10 +02:00
18091ea7e2
Merge pull request #1170 from vdemeester/omit-silvin
...
Add omitempty on compose config top-level types
2018-07-02 14:16:53 +02:00
f05ab2b1fb
Add omitempty on compose config top-level types
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-07-02 12:04:09 +02:00
981c099b96
Merge pull request #1169 from silvin-lubecki/schema-vendoring
...
Add a doc.go file so the compose/schema/data directory can be vendore…
2018-07-02 10:47:25 +02:00
1c69e83034
Merge pull request #1168 from vdemeester/update-testing
...
Update TESTING.md to replace testify by gotest.tools
2018-07-02 10:34:28 +02:00
3a8ef767f8
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>
2018-07-02 10:08:25 +02:00
9e36ff4491
Merge pull request #1160 from euank/simpler-pass
...
config/credentials: don't run 'pass' to detect it
2018-07-02 09:40:47 +02:00
057bf6f4d1
Update TESTING.md to replace testify by gotest.tools
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-07-02 09:24:28 +02:00
34ba66b0c5
Merge pull request #1157 from AzureCR/master
...
Updated the go-winio library to release 0.4.8 that has the fix for Windows Container
2018-06-29 21:11:53 +02:00
056015c3d8
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>
2018-06-29 11:38:39 -07:00
c98c4080a3
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>
2018-06-29 10:49:52 -07:00
da59ccb601
Merge pull request #1145 from Vimal-Raghubir/590-Add-missing-option
...
Add: Add missing option
2018-06-29 17:16:25 +02:00
9faf728089
Merge pull request #1155 from adshmh/add-unit-tests-to-plugin-list
...
added unit tests to cover plugin list command
2018-06-29 15:49:30 +02:00
7c7c299eee
Merge pull request #1152 from vdemeester/extract-converter
...
Extract StackConverter from the StackClient
2018-06-29 13:36:55 +02:00
3991b2fae3
Merge pull request #1158 from albers/completion-dockerd--default-address-pool
...
Add bash completion for `dockerd --default-address-pool`
2018-06-29 11:48:43 +02:00
fe7ec42566
Merge pull request #1159 from albers/completion-events-exec_die
...
Add bash completion for `exec_die` event
2018-06-29 11:47:58 +02:00
8443982188
Add bash completion for `exec_die` event
...
Signed-off-by: Harald Albers <github@albersweb.de>
2018-06-29 11:20:23 +02:00
0e6d9dfe85
Add bash completion for `dockerd --default-address-pool`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2018-06-29 11:11:24 +02:00
c26121df5c
added unit tests to cover plugin list command
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2018-06-28 16:51:54 -04:00
ea65e9043c
Merge pull request #1154 from thaJeztah/bump_version_18.07_dev
...
Bump version to 18.07.0-dev
2018-06-28 16:24:08 +02:00
f1fa1f3f15
Bump version to 18.07.0-dev
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-06-28 15:44:15 +02:00
293553944d
Merge pull request #1151 from vdemeester/update-docker-credential-helper-pass
...
Update docker-credential-helpers dependency
2018-06-28 14:57:05 +02:00
d9741fc96b
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>
2018-06-28 14:44:53 +02:00
b21f9dde61
Merge pull request #1149 from adshmh/add-unit-tests-to-plugin-install
...
added unit tests covering content trust for plugin install command
2018-06-28 09:28:18 +02:00
bc9b42ea9b
added unit tests covering content trust for plugin install command
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2018-06-27 22:16:19 -04:00
f2e6ee6899
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>
2018-06-27 16:41:00 +02:00
a205aecb80
Add: Add missing option
...
Signed-off-by: Vimal-Raghubir <vraghubir0418@gmail.com>
2018-06-26 22:20:01 -04:00
204ab4ca74
Merge pull request #1128 from vdemeester/interpolation-options
...
Add options to the compose loader
2018-06-26 15:05:54 +02:00
ae1618713f
Merge pull request #1147 from vdemeester/stack-refactoring
...
Refactor `stack` command/package
2018-06-26 15:00:17 +02:00
0f9d24f78d
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>
2018-06-26 14:07:26 +02:00
9fdd14f399
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>
2018-06-25 17:15:26 +02:00
61e53fc88a
Merge pull request #1138 from seemethere/env_experimental
...
Add env variable option for experimental
2018-06-25 14:47:16 +02:00
0f6936d557
Merge pull request #1129 from vdemeester/init-in-composefile
...
Add `init` support in 3.7 schema
2018-06-25 11:18:20 +02:00
38056740d6
Refactor tests
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
2018-06-25 11:13:32 +02:00
cc26da94ed
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>
2018-06-25 11:13:32 +02:00
e529043c51
Merge pull request #1126 from vdemeester/extra-extras
...
Add an `Extras` field on the compose config types.
2018-06-25 10:58:50 +02:00
80c26f618e
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>
2018-06-25 10:51:56 +02:00
e3bb62ed51
Add env variable option for experimental
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2018-06-24 21:15:02 +00:00
1c20e3f601
Merge pull request #1141 from adshmh/fix-output-leak-from-TestRunCommandWithContentTrustErrors
...
fixed output leak from TestRunCommandWithContentTrustErrors
2018-06-24 09:20:56 +02:00
d469cbdd14
fixed output leak from TestRunCommandWithContentTrustErrors unit tests
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2018-06-23 10:27:27 -04:00
cc9495ac89
Merge pull request #1139 from thaJeztah/add_orchestrator_warning
...
Warn if DOCKER_ORCHESTRATOR is still used but not DOCKER_STACK_ORCHESTRATOR
2018-06-23 14:33:28 +02:00
e8c87f7cb3
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>
2018-06-22 13:58:39 -07:00
e02c28f40a
Remove duplicated getOrchestrator(), and rename hideFlag()
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-06-22 13:58:14 -07:00
151990de62
Merge pull request #1137 from silvin-lubecki/stack-orchestrator
...
Fix broken swarm commands with Kubernetes defined as orchestrator
2018-06-22 13:56:42 -07:00
f0a8598b8d
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>
2018-06-21 23:33:55 -07:00
0f07b9ffc7
Update command usage and documentation
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-06-21 23:16:27 -07:00
a63252ba71
Remove "Stack Orchestrator" from "docker version"
...
The output of this information can be confusing,
so removing until we have a better design for this.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-06-21 22:02:11 -07:00
71272dd203
Scope orchestration selection to stack commands only
...
* Renaming DOCKER_ORCHESTRATOR to DOCKER_STACK_ORCHESTRATOR
* Renaming config file option "orchestrator" to "stackOrchestrator"
* "--orchestrator" flag is no more global but local to stack command and subcommands
* Cleaning all global orchestrator code
* Replicating Hidden flags in help and Supported flags from root command to stack command
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
2018-06-21 17:12:31 -07:00
Vincent Demeester
Sebastiaan van Stijn
Silvin Lubecki
Silvin
Vincent Demeester
Euan Kemp
Tejaswini Duggaraju
Harald Albers
Arash Deshmeh
Sebastiaan van Stijn
Vimal Raghubir
Eli Uriegas
Andrew Hsu