Skip to content

Fix ndots configuration#1995

Merged
fcrisciani merged 2 commits intomoby:masterfrom
fcrisciani:fix-ndots
Jan 9, 2018
Merged

Fix ndots configuration#1995
fcrisciani merged 2 commits intomoby:masterfrom
fcrisciani:fix-ndots

Conversation

@fcrisciani
Copy link
Copy Markdown

When ndots was being explicitely passed in the daemon conf
the configuration landing into the container was corrupted
e.g. options ndots:1 ndots:0
The fix just removes the user option so that is not replicated

FIXES: #1988

Signed-off-by: Flavio Crisciani flavio.crisciani@docker.com

When ndots was being explicitely passed in the daemon conf
the configuration landing into the container was corrupted
e.g. options ndots:1 ndots:0
The fix just removes the user option so that is not replicated

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
@codecov-io
Copy link
Copy Markdown

codecov-io commented Oct 20, 2017

Codecov Report

❗ No coverage uploaded for pull request base (master@0caae82). Click here to learn what that means.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #1995   +/-   ##
=========================================
  Coverage          ?   38.09%           
=========================================
  Files             ?      137           
  Lines             ?    27365           
  Branches          ?        0           
=========================================
  Hits              ?    10426           
  Misses            ?    15664           
  Partials          ?     1275
Impacted Files Coverage Δ
sandbox_dns_unix.go 52.18% <100%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0caae82...3dd39d6. Read the comment docs.

Validate that passing an option into the daemon config
does not corrupt the option set into the container resolv.conf

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
Copy link
Copy Markdown
Contributor

@selansen selansen left a comment

Choose a reason for hiding this comment

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

LGTM

@ddebroy
Copy link
Copy Markdown
Contributor

ddebroy commented Jan 9, 2018

LGTM

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.

ndots issue on daemon config for services

4 participants