Skip to content

Support override of binary name - #2007

Merged
mavenugo merged 1 commit into
moby:masterfrom
dnephin:support-override-of-binary-name
Oct 31, 2017
Merged

mavenugo merged 1 commit into
moby:masterfrom
dnephin:support-override-of-binary-name

Conversation

@dnephin

@dnephin dnephin commented Oct 31, 2017

Copy link
Copy Markdown
Member

This is necessary to support moby/moby#34226. The binary name docker-proxy is currently hardcoded in libnetwork. This is the smallest possible change to allow us to configure the binary name, by setting the following arg on go build of the engine binary:

--ldflags "-X github.com/docker/docker/vendor/github.com/docker/libnetwork/portmapper.userlandProxyCommandName=$PROXY_BINARY_NAME"

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
@dnephin

dnephin commented Oct 31, 2017

Copy link
Copy Markdown
Member Author

cc @mavenugo @tiborvass

@codecov-io

Copy link
Copy Markdown

Codecov Report

Merging #2007 into master will increase coverage by 0.05%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2007      +/-   ##
==========================================
+ Coverage   38.01%   38.07%   +0.05%     
==========================================
  Files         137      137              
  Lines       27362    27362              
==========================================
+ Hits        10402    10417      +15     
+ Misses      15688    15674      -14     
+ Partials     1272     1271       -1
Impacted Files Coverage Δ
portmapper/proxy.go 36.23% <ø> (ø) ⬆️
iptables/iptables.go 54.57% <0%> (+0.85%) ⬆️
networkdb/cluster.go 48.7% <0%> (+2.39%) ⬆️

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 dd20549...877edee. Read the comment docs.

@thaJeztah thaJeztah left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@mavenugo
mavenugo merged commit 6d1dc05 into moby:master Oct 31, 2017
@dnephin
dnephin deleted the support-override-of-binary-name branch November 1, 2017 16:04
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.

4 participants