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.

Sign up for GitHub

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

Jump to bottom

Apply newly loaded envvars to "DockerCli" and "APIClient" #9817

Merged
merged 1 commit into from
Sep 8, 2022
Merged

Apply newly loaded envvars to "DockerCli" and "APIClient" #9817

merged 1 commit into from
Sep 8, 2022

Conversation

ulyssessouza
Copy link
Collaborator

What I did
Re-evaluate DockerCli and APIClient after reading the environment file. I can contain DOCKER_HOST and/or DOCKER_CONTEXT so the DockerCli passed by docker/cli has to be re-evaluated. Also checks for DOCKER_CERT_PATH and DOCKER_TLS_VERIFY.

Related issue
Resolves #9210

Note: This is a "retry" of #9745 that was reverted in #9792

ulyssessouza
ulyssessouza commented Sep 7, 2022
View reviewed changes
@ulyssessouza ulyssessouza force-pushed the apply-newly-loaded-envvars branch from 13f3138 to 7f6abfe Compare September 7, 2022 17:27
@ulyssessouza ulyssessouza marked this pull request as ready for review September 7, 2022 17:40
milas
milas approved these changes Sep 7, 2022
View reviewed changes
Copy link
Contributor

@milas milas left a comment

Choose a reason for hiding this comment

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

LGTM

Though I do think we should look to getting a fix into docker/cli itself; never a good feeling to be working around our own projects 🙈

glours
glours approved these changes Sep 8, 2022
View reviewed changes
Copy link
Contributor

@glours glours left a comment

Choose a reason for hiding this comment

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

LGTM

@ulyssessouza
Apply newly loaded envvars to "DockerCli" and "APIClient"
79af3cd 
Re-evaluate DockerCli and APIClient after reading the environment file.
I can contain DOCKER_HOST and/or DOCKER_CONTEXT so the DockerCli passed by docker/cli has to be re-evaluated.
Also checks for DOCKER_CERT_PATH and DOCKER_TLS_VERIFY.

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
@ulyssessouza ulyssessouza force-pushed the apply-newly-loaded-envvars branch from 7f6abfe to 79af3cd Compare September 8, 2022 16:23
@ulyssessouza ulyssessouza merged commit 126cb98 into docker:v2 Sep 8, 2022
@laurazard laurazard mentioned this pull request Sep 19, 2022
Closed
milas added a commit to milas/compose that referenced this pull request Sep 23, 2022
@milas
Revert "Merge pull request docker#9817 from ulyssessouza/apply-newly-…
b6cb27e 
…loaded-envvars"

This reverts commit 126cb98, reversing
changes made to b80222f.
@milas milas mentioned this pull request Sep 23, 2022
Merged
milas added a commit to milas/compose that referenced this pull request Sep 23, 2022
@milas
Revert "Merge pull request docker#9817 from ulyssessouza/apply-newly-…
d3d99b6 
…loaded-envvars"

This reverts commit 126cb98, reversing
changes made to b80222f.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
milas added a commit that referenced this pull request Sep 26, 2022
@milas
Remove support for DOCKER_HOST in .env files (#9871)
a95cc40 
Revert "Merge pull request #9817 from ulyssessouza/apply-newly-loaded-envvars"

This reverts commit 126cb98, reversing
changes made to b80222f.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@glours glours glours approved these changes

@milas milas milas approved these changes

@nicksieger nicksieger Awaiting requested review from nicksieger

@laurazard laurazard Awaiting requested review from laurazard

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Support setting DOCKER_HOST in .env file
3 participants
@ulyssessouza @glours @milas