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

Add ip address to advanced options #1803

Merged

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Apr 3, 2019

follow-up to #1767
partially implements: moby/moby#31964 (RFC: add advanced "csv" syntax for "--net" / "--network")

this allows setting the ip/ipv6 address as a network-option;

docker run --network name=mynetwork,ip=172.20.88.22,ip6=2001:db8::8822

@thaJeztah

This comment has been minimized.

@thaJeztah thaJeztah force-pushed the add_ip_address_to_advanced_options branch 4 times, most recently from 8b591a7 to 7c59932 Compare April 3, 2019 14:47
@codecov-io
Copy link

Codecov Report

Merging #1803 into master will increase coverage by 0.13%.
The diff coverage is 75.72%.

@@            Coverage Diff             @@
##           master    #1803      +/-   ##
==========================================
+ Coverage   56.28%   56.42%   +0.13%     
==========================================
  Files         308      308              
  Lines       21299    21370      +71     
==========================================
+ Hits        11988    12057      +69     
+ Misses       8436     8434       -2     
- Partials      875      879       +4

@codecov-io
Copy link

codecov-io commented Apr 3, 2019

Codecov Report

Merging #1803 into master will increase coverage by 0.02%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master    #1803      +/-   ##
==========================================
+ Coverage   56.32%   56.34%   +0.02%     
==========================================
  Files         308      308              
  Lines       21387    21397      +10     
==========================================
+ Hits        12047    12057      +10     
  Misses       8461     8461              
  Partials      879      879

This allows setting the ip/ipv6 address as an option in the
advanced `--network` syntax;

```
docker run --network name=mynetwork,ip=172.20.88.22,ip6=2001:db8::8822
```

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah force-pushed the add_ip_address_to_advanced_options branch from 7c59932 to 70d8e0b Compare April 3, 2019 15:03
@thaJeztah
Copy link
Member Author

rebased @silvin-lubecki @vdemeester this should be ready for review as well 🤗

networkOptName = "name"
networkOptAlias = "alias"
networkOptIPv4Address = "ip"
networkOptIPv6Address = "ip6"
Copy link
Member Author

Choose a reason for hiding this comment

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

Let me know if this naming LGTY; I see the compose-file uses https://docs.docker.com/compose/compose-file/#ipv4_address-ipv6_address

        ipv4_address: 172.16.238.10
        ipv6_address: 2001:3984:3989::10

Copy link
Contributor

Choose a reason for hiding this comment

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

naming LGTM 👍

Copy link
Contributor

@silvin-lubecki silvin-lubecki left a comment

Choose a reason for hiding this comment

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

LGTM

@silvin-lubecki silvin-lubecki merged commit 8547dfc into docker:master Dec 4, 2019
@silvin-lubecki
Copy link
Contributor

We need a follow-up to update the docs and examples.

@thaJeztah thaJeztah deleted the add_ip_address_to_advanced_options branch December 4, 2019 16:08
@thaJeztah thaJeztah added this to the 20.03.0 milestone Feb 19, 2020
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.

4 participants