From 2dc593f67fb581c73d89e607be83c1358631819b Mon Sep 17 00:00:00 2001 From: Dominik Braun Date: Fri, 24 Apr 2020 12:39:24 +0200 Subject: [PATCH 1/2] Add container_iface_prefix option to documentation Signed-off-by: dominikbraun (cherry picked from commit 84a07a9977cb6eb186faa9eca0c98e24ffa96611) Signed-off-by: Sebastiaan van Stijn --- docs/reference/commandline/network_create.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/reference/commandline/network_create.md b/docs/reference/commandline/network_create.md index 9151e52f7a..ca8046a7ab 100644 --- a/docs/reference/commandline/network_create.md +++ b/docs/reference/commandline/network_create.md @@ -170,11 +170,12 @@ equivalent docker daemon flags used for docker0 bridge: | Option | Equivalent | Description | |--------------------------------------------------|-------------|-------------------------------------------------------| -| `com.docker.network.bridge.name` | - | bridge name to be used when creating the Linux bridge | +| `com.docker.network.bridge.name` | - | Bridge name to be used when creating the Linux bridge | | `com.docker.network.bridge.enable_ip_masquerade` | `--ip-masq` | Enable IP masquerading | | `com.docker.network.bridge.enable_icc` | `--icc` | Enable or Disable Inter Container Connectivity | | `com.docker.network.bridge.host_binding_ipv4` | `--ip` | Default IP when binding container ports | | `com.docker.network.driver.mtu` | `--mtu` | Set the containers network MTU | +| `com.docker.network.container_interface_prefix` | - | Set a custom prefix for container interfaces | The following arguments can be passed to `docker network create` for any network driver, again with their approximate equivalents to `docker daemon`. From 0cfe29431c348d92323f176b702b199709f18a45 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 24 Apr 2020 13:42:04 +0200 Subject: [PATCH 2/2] service update: fix service create example Service create expects the name to be passed using the `--name` flag, not as a positional parameter Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 0cd7c6aa0288e8219ba21ac24a92a09ab73d91e1) Signed-off-by: Sebastiaan van Stijn --- docs/reference/commandline/service_update.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/docs/reference/commandline/service_update.md b/docs/reference/commandline/service_update.md index 34559555e0..5eb8ded368 100644 --- a/docs/reference/commandline/service_update.md +++ b/docs/reference/commandline/service_update.md @@ -158,16 +158,13 @@ service name. ```bash $ docker service create \ --name=myservice \ - --mount \ - type=volume,source=test-data,target=/somewhere \ - nginx:alpine \ - myservice + --mount type=volume,source=test-data,target=/somewhere \ + nginx:alpine myservice $ docker service update \ - --mount-add \ - type=volume,source=other-volume,target=/somewhere-else \ + --mount-add type=volume,source=other-volume,target=/somewhere-else \ myservice myservice