Skip to content

Update proxy config if present - #1320

Closed
dhiltgen wants to merge 1 commit into
docker:masterfrom
dhiltgen:play_nice_with_proxy_master
Closed

Update proxy config if present#1320
dhiltgen wants to merge 1 commit into
docker:masterfrom
dhiltgen:play_nice_with_proxy_master

Conversation

@dhiltgen

Copy link
Copy Markdown
Contributor

If the system has a containerd-proxy managing the lifecycle
of the daemon, make sure the config is updated with the new image
on update.

Signed-off-by: Daniel Hiltgen daniel.hiltgen@docker.com
(cherry picked from commit f96ddae)
Signed-off-by: Daniel Hiltgen daniel.hiltgen@docker.com

Cherry-pick of #1317

If the system has a containerd-proxy managing the lifecycle
of the daemon, make sure the config is updated with the new image
on update.
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
(cherry picked from commit f96ddae)
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
@codecov-io

Copy link
Copy Markdown

Codecov Report

Merging #1320 into master will increase coverage by 0.02%.
The diff coverage is 67.56%.

@@ Coverage Diff @@## master #1320 +/- ##
==========================================
+ Coverage 54.73% 54.75% +0.02% 
==========================================
Files 292 293 +1 Lines 19267 19304 +37 ==========================================
+ Hits 10545 10570 +25 - Misses 8063 8072 +9 - Partials 659 662 +3

@thaJeztah

Copy link
Copy Markdown
Member

closing because this was removed in #2207

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.

4 participants

@dhiltgen@codecov-io@thaJeztah@GordonTheTurtle