Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect aux-address examples and test 

The (host)name for aux-addresses should
be unique, otherwise later values overwrite
earlier values.

Before this change, the example command
would send this API request;

    {
      "Attachable": false,
      "CheckDuplicate": true,
      "Driver": "overlay",
      "EnableIPv6": false,
      "IPAM": {
        "Config": [
          {
            "Gateway": "192.168.0.100",
            "IPRange": "192.168.1.0/24",
            "Subnet": "192.168.0.0/16"
          },
          {
            "AuxiliaryAddresses": {
              "a": "192.170.1.5",
              "b": "192.170.1.6"
            },
            "Gateway": "192.170.0.100",
            "Subnet": "192.170.0.0/16"
          }
        ],
        "Driver": "default",
        "Options": {
        }
      },
      "Internal": false,
      "Labels": {
      },
      "Name": "my-multihost-network",
      "Options": {
      }
    }

After this change, the request looks
like this (all aux-addresses preserved);

    {
      "Attachable": false,
      "CheckDuplicate": true,
      "Driver": "overlay",
      "EnableIPv6": false,
      "IPAM": {
        "Config": [
          {
            "AuxiliaryAddresses": {
              "my-router": "192.168.1.5",
              "my-switch": "192.168.1.6"
            },
            "Gateway": "192.168.0.100",
            "IPRange": "192.168.1.0/24",
            "Subnet": "192.168.0.0/16"
          },
          {
            "AuxiliaryAddresses": {
              "my-printer": "192.170.1.5",
              "my-nas": "192.170.1.6"
            },
            "Gateway": "192.170.0.100",
            "Subnet": "192.170.0.0/16"
          }
        ],
        "Driver": "default",
        "Options": {
        }
      },
      "Internal": false,
      "Labels": {
      },
      "Name": "my-multihost-network",
      "Options": {
      }
    }

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2016-09-27 01:02:57 +02:00 committed by Tibor Vass
parent ee85efb76d
commit 676773a780
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/reference/commandline/network_create.md
View File

@ -136,8 +136,8 @@ $ docker network create -d overlay \
--gateway=192.168.0.100 \ --gateway=192.168.0.100 \
--gateway=192.170.0.100 \ --gateway=192.170.0.100 \
--ip-range=192.168.1.0/24 \ --ip-range=192.168.1.0/24 \
--aux-address a=192.168.1.5 --aux-address b=192.168.1.6 \ --aux-address="my-router=192.168.1.5" --aux-address="my-switch=192.168.1.6" \
--aux-address a=192.170.1.5 --aux-address b=192.170.1.6 \ --aux-address="my-printer=192.170.1.5" --aux-address="my-nas=192.170.1.6" \
my-multihost-network my-multihost-network
``` ```

4
man/docker-network-create.1.md
View File

@ -127,8 +127,8 @@ $ docker network create -d overlay \
--gateway=192.168.0.100 \ --gateway=192.168.0.100 \
--gateway=192.170.0.100 \ --gateway=192.170.0.100 \
--ip-range=192.168.1.0/24 \ --ip-range=192.168.1.0/24 \
--aux-address a=192.168.1.5 --aux-address b=192.168.1.6 \ --aux-address="my-router=192.168.1.5" --aux-address="my-switch=192.168.1.6" \
--aux-address a=192.170.1.5 --aux-address b=192.170.1.6 \ --aux-address="my-printer=192.170.1.5" --aux-address="my-nas=192.170.1.6" \
my-multihost-network my-multihost-network
``` ```