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

[19.03 backport] restore support for env variables to configure proxy #2061

Merged
merged 1 commit into from
Aug 22, 2019

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Aug 22, 2019

fixes ENGCORE-930

backport of #2059

regression introduced by b34f340 (#1501)

fixes #2027
fixes moby/moby#39654

Signed-off-by: Nicolas De Loof nicolas.deloof@gmail.com

- What I did
fix moby/moby#39654

- How I did it
restored order of client.Opt. WithHttpClient must come first

- How to verify it
added a test case to cover this scenario

- Description for the changelog
restore support for env variables to configure proxy

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

regression introduced by b34f34
close #39654

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
(cherry picked from commit e25e077)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Member Author

ping @silvin-lubecki @ndeloof PTAL

@codecov-io
Copy link

Codecov Report

Merging #2061 into 19.03 will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##            19.03    #2061   +/-   ##
=======================================
  Coverage   56.75%   56.75%           
=======================================
  Files         311      311           
  Lines       21824    21824           
=======================================
  Hits        12387    12387           
  Misses       8522     8522           
  Partials      915      915

1 similar comment
@codecov-io
Copy link

Codecov Report

Merging #2061 into 19.03 will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##            19.03    #2061   +/-   ##
=======================================
  Coverage   56.75%   56.75%           
=======================================
  Files         311      311           
  Lines       21824    21824           
=======================================
  Hits        12387    12387           
  Misses       8522     8522           
  Partials      915      915

Copy link
Contributor

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

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

LGTM

@thaJeztah
Copy link
Member Author

all green; merging

@thaJeztah thaJeztah merged commit c8e9c04 into docker:19.03 Aug 22, 2019
@thaJeztah thaJeztah deleted the 19.03_backport_issue39654 branch August 22, 2019 17:55
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.

None yet

5 participants