moby--moby/man
Sebastiaan van Stijn ca474f7808
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>
(cherry picked from commit fd7161bb30)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-29 14:28:52 +02:00
..
Dockerfile Fix the man/Dockerfile for arm 2016-08-11 17:56:46 -07:00
Dockerfile.5.md
Dockerfile.armhf Fix the man/Dockerfile for arm 2016-08-11 17:56:46 -07:00
README.md
docker-attach.1.md
docker-build.1.md
docker-commit.1.md
docker-config-json.5.md
docker-cp.1.md
docker-create.1.md Revert "Merge pull request #26320 from yongtang/09052016-man-docker-create" 2016-09-21 19:48:43 +02:00
docker-diff.1.md
docker-events.1.md
docker-exec.1.md
docker-export.1.md
docker-history.1.md
docker-images.1.md
docker-import.1.md
docker-info.1.md
docker-inspect.1.md
docker-kill.1.md
docker-load.1.md
docker-login.1.md Merge pull request #26307 from AkihiroSuda/fix-doc-26291 2016-09-06 12:31:59 -07:00
docker-logout.1.md
docker-logs.1.md
docker-network-connect.1.md
docker-network-create.1.md Fix incorrect aux-address examples and test 2016-09-29 14:28:52 +02:00
docker-network-disconnect.1.md
docker-network-inspect.1.md
docker-network-ls.1.md Fix incorrect help output in `docker network ls` 2016-09-26 19:33:52 -07:00
docker-network-rm.1.md
docker-pause.1.md
docker-port.1.md
docker-ps.1.md
docker-pull.1.md
docker-push.1.md Synchronize push reference with man page 2016-09-29 14:17:37 +02:00
docker-rename.1.md Merge pull request #26224 from q384566678/test-zhou 2016-09-16 10:03:12 -07:00
docker-restart.1.md Merge pull request #26264 from q384566678/test-two 2016-09-09 14:45:22 -07:00
docker-rm.1.md
docker-rmi.1.md
docker-run.1.md Fix capitalization 2016-08-17 23:22:00 +02:00
docker-save.1.md
docker-search.1.md
docker-start.1.md
docker-stats.1.md
docker-stop.1.md
docker-tag.1.md
docker-top.1.md
docker-unpause.1.md
docker-update.1.md
docker-version.1.md
docker-wait.1.md
docker.1.md
dockerd.8.md
generate.go
generate.sh
glide.lock
glide.yaml
md2man-all.sh

README.md

Docker Documentation

This directory contains scripts for generating the man pages. Many of the man pages are generated directly from the spf13/cobra Command definition. Some legacy pages are still generated from the markdown files in this directory. Do not edit the man pages in the man1 directory. Instead, update the Cobra command or amend the Markdown files for legacy pages.

Generate the man pages

From within the project root directory run:

make manpages