Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Always initialize context store #1690

Merged
merged 3 commits into from
Mar 18, 2019

Conversation

jcsirot
Copy link
Contributor

@jcsirot jcsirot commented Feb 25, 2019

- What I did
Always initialize context store even when the CLI has already a client. It happens when the CLI is initialized from a plugin.

- A picture of a cute animal (not mandatory but encouraged)

image

cli/command/cli.go Outdated Show resolved Hide resolved
@codecov-io
Copy link

codecov-io commented Feb 25, 2019

Codecov Report

Merging #1690 into master will increase coverage by 0.05%.
The diff coverage is 27.27%.

@@            Coverage Diff             @@
##           master    #1690      +/-   ##
==========================================
+ Coverage   56.13%   56.19%   +0.05%     
==========================================
  Files         306      306              
  Lines       21038    21037       -1     
==========================================
+ Hits        11809    11821      +12     
+ Misses       8374     8357      -17     
- Partials      855      859       +4

ulyssessouza added a commit to docker/app that referenced this pull request Mar 7, 2019
- Update docker/cli is now pointing to ulyssessouza/cli.
The change needs the merge of docker/cli#1710
and docker/cli#1690
- Fix issues relative paths in Jenkinsfile and Jenkinsfile.baguette
- Avoid using '--config' in favor of env variable 'DOCKER_CONFIG'

Signed-off-by: Ulysses Souza <[email protected]>
chris-crone pushed a commit to chris-crone/app that referenced this pull request Mar 7, 2019
- Update docker/cli is now pointing to ulyssessouza/cli.
The change needs the merge of docker/cli#1710
and docker/cli#1690
- Fix issues relative paths in Jenkinsfile and Jenkinsfile.baguette
- Avoid using '--config' in favor of env variable 'DOCKER_CONFIG'

Signed-off-by: Ulysses Souza <[email protected]>
chris-crone pushed a commit to chris-crone/app that referenced this pull request Mar 8, 2019
- Update docker/cli is now pointing to chris-crone/cli.
The change needs the merge of docker/cli#1718
and docker/cli#1690
- Fix issues relative paths in Jenkinsfile and Jenkinsfile.baguette
- Avoid using '--config' in favor of env variable 'DOCKER_CONFIG'

Signed-off-by: Ulysses Souza <[email protected]>
chris-crone pushed a commit to chris-crone/app that referenced this pull request Mar 8, 2019
- Update docker/cli is now pointing to chris-crone/cli.
The change needs the merge of docker/cli#1718
and docker/cli#1690
- Fix issues relative paths in Jenkinsfile and Jenkinsfile.baguette
- Avoid using '--config' in favor of env variable 'DOCKER_CONFIG'

Signed-off-by: Ulysses Souza <[email protected]>
@simonferquel
Copy link
Contributor

Please rebase this one :)

Jean-Christophe Sirot added 3 commits March 13, 2019 14:18
Signed-off-by: Jean-Christophe Sirot <[email protected]>
…t case the `TestDialStdio` e2e test had to be modified: the `--tls` option triggers an error since the endpoint resolution tries to read the `${DOCKER_CERT_PATH}/ca.pem` file which does not exist.

Signed-off-by: Jean-Christophe Sirot <[email protected]>
Signed-off-by: Jean-Christophe Sirot <[email protected]>
@jcsirot jcsirot force-pushed the fix-contextstore-for-plugins branch from ef04489 to a1af6e2 Compare March 13, 2019 13:19
Copy link
Contributor

@silvin-lubecki silvin-lubecki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@silvin-lubecki
Copy link
Contributor

@thaJeztah PTAL

Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@@ -209,12 +209,13 @@ func (cli *DockerCli) Initialize(opts *cliflags.ClientOptions, ops ...Initialize

cli.configFile = cliconfig.LoadDefaultConfigFile(cli.err)

cli.contextStore = store.New(cliconfig.ContextStoreDir(), cli.contextStoreConfig)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not for this PR, but wondering if we should consider having a WithContextStore() ops

@thaJeztah thaJeztah merged commit 86a5a48 into docker:master Mar 18, 2019
@GordonTheTurtle GordonTheTurtle added this to the 19.03.0 milestone Mar 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants