*: appc/cni -> containernetworking/cni

The project has been moved so internally we simply rename everything.
Consumers are recommended to update their vendored version of cni.
This commit is contained in:
Stefan Junker 2016-05-04 16:06:05 +02:00
parent 0b6ad716e8
commit 680d1f6ec2
2 changed files with 2 additions and 2 deletions

View File

@ -3,7 +3,7 @@
## Overview ## Overview
With dhcp plugin the containers can get an IP allocated by a DHCP server already running on your network. With dhcp plugin the containers can get an IP allocated by a DHCP server already running on your network.
This can be especially useful with plugin types such as [macvlan](https://github.com/appc/cni/blob/master/Documentation/macvlan.md). This can be especially useful with plugin types such as [macvlan](https://github.com/containernetworking/cni/blob/master/Documentation/macvlan.md).
Because a DHCP lease must be periodically renewed for the duration of container lifetime, a separate daemon is required to be running. Because a DHCP lease must be periodically renewed for the duration of container lifetime, a separate daemon is required to be running.
The same plugin binary can also be run in the daemon mode. The same plugin binary can also be run in the daemon mode.

View File

@ -32,7 +32,7 @@ It stores the state locally on the host filesystem, therefore ensuring uniquenes
* `routes` (string, optional): list of routes to add to the container namespace. Each route is a dictionary with "dst" and optional "gw" fields. If "gw" is omitted, value of "gateway" will be used. * `routes` (string, optional): list of routes to add to the container namespace. Each route is a dictionary with "dst" and optional "gw" fields. If "gw" is omitted, value of "gateway" will be used.
## Supported arguments ## Supported arguments
The following [CNI_ARGS](https://github.com/appc/cni/blob/master/SPEC.md#parameters) are supported: The following [CNI_ARGS](https://github.com/containernetworking/cni/blob/master/SPEC.md#parameters) are supported:
* `ip`: request a specific IP address from the subnet. If it's not available, the plugin will exit with an error * `ip`: request a specific IP address from the subnet. If it's not available, the plugin will exit with an error