Skip to content

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

Merged
ulyssessouza merged 1 commit intodocker:v2from
ulyssessouza:apply-newly-loaded-envvars
Sep 8, 2022
Merged

Apply newly loaded envvars to "DockerCli" and "APIClient"#9817
ulyssessouza merged 1 commit intodocker:v2from
ulyssessouza:apply-newly-loaded-envvars

Conversation

@ulyssessouza
Copy link
Contributor

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 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
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 🙈

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

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
milas added a commit to milas/compose that referenced this pull request Sep 23, 2022
…loaded-envvars"

This reverts commit 126cb98, reversing
changes made to b80222f.
milas added a commit to milas/compose that referenced this pull request Sep 23, 2022
…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
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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Support setting DOCKER_HOST in .env file

3 participants