Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions _data/engine-cli/docker_context_create.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ options:
value_type: string
description: |
Default orchestrator for stack operations to use with this context (swarm|kubernetes|all)
deprecated: false
deprecated: true
experimental: false
experimentalcli: false
kubernetes: false
Expand Down Expand Up @@ -45,10 +45,10 @@ options:
value_type: stringToString
default_value: '[]'
description: set the kubernetes endpoint
deprecated: false
deprecated: true
experimental: false
experimentalcli: false
kubernetes: false
kubernetes: true
swarm: false
examples: |-
### Create a context with a docker and kubernetes endpoint
Expand Down
4 changes: 2 additions & 2 deletions _data/engine-cli/docker_context_export.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ options:
value_type: bool
default_value: "false"
description: Export as a kubeconfig file
deprecated: false
deprecated: true
experimental: false
experimentalcli: false
kubernetes: false
kubernetes: true
swarm: false
deprecated: false
experimental: false
Expand Down
6 changes: 3 additions & 3 deletions _data/engine-cli/docker_context_update.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ options:
value_type: string
description: |
Default orchestrator for stack operations to use with this context (swarm|kubernetes|all)
deprecated: false
deprecated: true
experimental: false
experimentalcli: false
kubernetes: false
Expand All @@ -37,10 +37,10 @@ options:
value_type: stringToString
default_value: '[]'
description: set the kubernetes endpoint
deprecated: false
deprecated: true
experimental: false
experimentalcli: false
kubernetes: false
kubernetes: true
swarm: false
examples: |-
### Update an existing context
Expand Down
2 changes: 1 addition & 1 deletion _data/engine-cli/docker_network_create.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ examples: |-
| `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 |
| `com.docker.network.container_iface_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`.
Expand Down
2 changes: 1 addition & 1 deletion _data/engine-cli/docker_pull.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ examples: |-

```dockerfile
FROM ubuntu@sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2
LABEL maintainer="some maintainer <maintainer@example.com>"
LABEL org.opencontainers.image.authors="some maintainer <maintainer@example.com>"
```

> **Note**
Expand Down
2 changes: 1 addition & 1 deletion _data/engine-cli/docker_run.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1236,7 +1236,7 @@ examples: |-
If you want to add a running container to a network use the `docker network connect` subcommand.

You can connect multiple containers to the same network. Once connected, the
containers can communicate easily need only another container's IP address
containers can communicate easily using only another container's IP address
or name. For `overlay` networks or custom plugins that support multi-host
connectivity, containers connected to the same multi-host network but launched
from different Engines can also communicate in this way.
Expand Down
4 changes: 2 additions & 2 deletions _data/engine-cli/docker_stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ options:
- option: kubeconfig
value_type: string
description: Kubernetes config file
deprecated: false
deprecated: true
experimental: false
experimentalcli: false
kubernetes: true
swarm: false
- option: orchestrator
value_type: string
description: Orchestrator to use (swarm|kubernetes|all)
deprecated: false
deprecated: true
experimental: false
experimentalcli: false
kubernetes: false
Expand Down
6 changes: 3 additions & 3 deletions _data/engine-cli/docker_stack_deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ options:
- option: namespace
value_type: string
description: Kubernetes namespace to use
deprecated: false
deprecated: true
experimental: false
experimentalcli: false
kubernetes: true
Expand Down Expand Up @@ -67,15 +67,15 @@ inherited_options:
- option: kubeconfig
value_type: string
description: Kubernetes config file
deprecated: false
deprecated: true
experimental: false
experimentalcli: false
kubernetes: true
swarm: false
- option: orchestrator
value_type: string
description: Orchestrator to use (swarm|kubernetes|all)
deprecated: false
deprecated: true
experimental: false
experimentalcli: false
kubernetes: false
Expand Down
8 changes: 4 additions & 4 deletions _data/engine-cli/docker_stack_ls.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ options:
value_type: bool
default_value: "false"
description: List stacks from all Kubernetes namespaces
deprecated: false
deprecated: true
experimental: false
experimentalcli: false
kubernetes: true
Expand All @@ -35,7 +35,7 @@ options:
value_type: stringSlice
default_value: '[]'
description: Kubernetes namespaces to use
deprecated: false
deprecated: true
experimental: false
experimentalcli: false
kubernetes: true
Expand All @@ -44,15 +44,15 @@ inherited_options:
- option: kubeconfig
value_type: string
description: Kubernetes config file
deprecated: false
deprecated: true
experimental: false
experimentalcli: false
kubernetes: true
swarm: false
- option: orchestrator
value_type: string
description: Orchestrator to use (swarm|kubernetes|all)
deprecated: false
deprecated: true
experimental: false
experimentalcli: false
kubernetes: false
Expand Down
6 changes: 3 additions & 3 deletions _data/engine-cli/docker_stack_ps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ options:
- option: namespace
value_type: string
description: Kubernetes namespace to use
deprecated: false
deprecated: true
experimental: false
experimentalcli: false
kubernetes: true
Expand Down Expand Up @@ -70,15 +70,15 @@ inherited_options:
- option: kubeconfig
value_type: string
description: Kubernetes config file
deprecated: false
deprecated: true
experimental: false
experimentalcli: false
kubernetes: true
swarm: false
- option: orchestrator
value_type: string
description: Orchestrator to use (swarm|kubernetes|all)
deprecated: false
deprecated: true
experimental: false
experimentalcli: false
kubernetes: false
Expand Down
6 changes: 3 additions & 3 deletions _data/engine-cli/docker_stack_rm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ options:
- option: namespace
value_type: string
description: Kubernetes namespace to use
deprecated: false
deprecated: true
experimental: false
experimentalcli: false
kubernetes: true
Expand All @@ -26,15 +26,15 @@ inherited_options:
- option: kubeconfig
value_type: string
description: Kubernetes config file
deprecated: false
deprecated: true
experimental: false
experimentalcli: false
kubernetes: true
swarm: false
- option: orchestrator
value_type: string
description: Orchestrator to use (swarm|kubernetes|all)
deprecated: false
deprecated: true
experimental: false
experimentalcli: false
kubernetes: false
Expand Down
6 changes: 3 additions & 3 deletions _data/engine-cli/docker_stack_services.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ options:
- option: namespace
value_type: string
description: Kubernetes namespace to use
deprecated: false
deprecated: true
experimental: false
experimentalcli: false
kubernetes: true
Expand All @@ -52,15 +52,15 @@ inherited_options:
- option: kubeconfig
value_type: string
description: Kubernetes config file
deprecated: false
deprecated: true
experimental: false
experimentalcli: false
kubernetes: true
swarm: false
- option: orchestrator
value_type: string
description: Orchestrator to use (swarm|kubernetes|all)
deprecated: false
deprecated: true
experimental: false
experimentalcli: false
kubernetes: false
Expand Down
2 changes: 1 addition & 1 deletion _data/engine-cli/docker_version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ options:
- option: kubeconfig
value_type: string
description: Kubernetes config file
deprecated: false
deprecated: true
experimental: false
experimentalcli: false
kubernetes: true
Expand Down