54575c4167
This fix tries to address the issue raised in comment: https://github.com/docker/docker/pull/25943#discussion_r76843081 Previously, the validation for `ip6` is done by checking ParseIP().To16(). However, in case an IPv4 address or an IPv4-mapped Ipv6 address has been provided, the validation will pass (should fail). This fix first check if `--ip6` is passed with a valid IP address and returns error for invalid IP addresses. It then check if an IPv4 or IPv4-mapped Ipv6 address is passed, and return error accordingly. This fix adds two more cases in the tests. One for IPv4 address passed to `--ip6` and another for Ipv4-mapped IPv6 address passed to `--ip6`. In both cases, without this fix the validation will pass through. Signed-off-by: Yong Tang <yong.tang.github@outlook.com> Upstream-commit: 1e6eccae69bd9b1f65ec87c33a6a872c81f7fb23 Component: engine