Skip to content

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

Merged
thaJeztah merged 1 commit into
docker:19.03from
thaJeztah:19.03_backport_issue39654
Aug 22, 2019
Merged

[19.03 backport] restore support for env variables to configure proxy#2061
thaJeztah merged 1 commit into
docker:19.03from
thaJeztah:19.03_backport_issue39654

Conversation

@thaJeztah

@thaJeztahthaJeztah commented Aug 22, 2019

Copy link
Copy Markdown
Member

fixes ENGCORE-930

backport of #2059

regression introduced by b34f340 (#1501)

fixes#2027
fixesmoby/moby#39654

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

- What I did
fixmoby/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
Copy Markdown
MemberAuthor

ping @silvin-lubecki@ndeloof PTAL

@codecov-io

Copy link
Copy Markdown

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
Copy Markdown

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

@andrewhsuandrewhsu left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@thaJeztah

Copy link
Copy Markdown
MemberAuthor

all green; merging

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

5 participants

@thaJeztah@codecov-io@andrewhsu@GordonTheTurtle@ndeloof