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.

Sign up for GitHub

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

Jump to bottom

[carry 317] Cli change to pass driver specific options to docker run #1767

Merged
merged 3 commits into from
Apr 3, 2019
Merged

[carry 317] Cli change to pass driver specific options to docker run #1767

merged 3 commits into from
Apr 3, 2019

Commits on Apr 3, 2019

  1. Cli change to pass driver specific options to docker run 

    The commit contains cli changes to support driver options for a network in
docker run and docker network connect cli's. The driver-opt, aliases is now
supported in the form of csv as per network option in service commands in
swarm mode since docker#62 . This commit extends this support to docker
run command as well.

For docker connect command `--driver-opt` is added to pass driver specific
options for the network the container is connecting to.

Signed-off-by: Abhinandan Prativadi <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @abhi @thaJeztah
    abhi authored and thaJeztah committed Apr 3, 2019
    Configuration menu
    Copy the full SHA
    c4844b1 View commit details
    Browse the repository at this point in the history

  2. Minor touch-ups in network-option tests 

    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @thaJeztah
    thaJeztah committed Apr 3, 2019
    Configuration menu
    Copy the full SHA
    a88d17c View commit details
    Browse the repository at this point in the history

  3. Refactor network parsing, add preliminary support for multiple networks 

    This refactors the way networking options are parsed, and makes the
client able to pass options for multiple networks. Currently, the
daemon does not yet accept multiple networks when creating a container,
and will produce an error.

For backward-compatibility, the following global networking-related
options are associated with the first network (in case multiple
networks are set);

  - `--ip`
  - `--ip6`
  - `--link`
  - `--link-local-ip`
  - `--network-alias`

Not all of these options are supported yet in the advanced notation,
but for options that are supported, setting both the per-network option
and the global option will produce a "conflicting options" error.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
    @thaJeztah
    thaJeztah committed Apr 3, 2019
    Configuration menu
    Copy the full SHA
    5bc0963 View commit details
    Browse the repository at this point in the history