Skip to content

Commit

Permalink
Merge pull request opencontainers#989 from dineshgovindasamy/windowsn…
Browse files Browse the repository at this point in the history
…amespace

Support for network namespace in windows
  • Loading branch information
vbatts authored Sep 9, 2018
2 parents d810dbc + 6f5fcd4 commit eba862d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
4 changes: 3 additions & 1 deletion config-windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ The following parameters can be specified:
* **`allowUnqualifiedDNSQuery`** *(bool, OPTIONAL)* - specifies if unqualified DNS name resolution is allowed.
* **`DNSSearchList`** *(array of strings, OPTIONAL)* - comma separated list of DNS suffixes to use for name resolution.
* **`networkSharedContainerName`** *(string, OPTIONAL)* - name (ID) of the container that we will share with the network stack.
* **`networkNamespace`** *(string, OPTIONAL)* - name (ID) of the network namespace that will be used for the container. If a network namespace is specified no other parameter must be specified.

### Example

Expand All @@ -139,7 +140,8 @@ The following parameters can be specified:
"a.com",
"b.com"
],
"networkSharedContainerName": "containerName"
"networkSharedContainerName": "containerName",
"networkNamespace": "168f3daf-efc6-4377-b20a-2c86764ba892"
}
}
```
Expand Down
3 changes: 3 additions & 0 deletions schema/config-windows.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@
},
"networkSharedContainerName": {
"type": "string"
},
"networkNamespace": {
"type": "string"
}
}
},
Expand Down
2 changes: 2 additions & 0 deletions specs-go/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,8 @@ type WindowsNetwork struct {
DNSSearchList []string `json:"DNSSearchList,omitempty"`
// Name (ID) of the container that we will share with the network stack.
NetworkSharedContainerName string `json:"networkSharedContainerName,omitempty"`
// name (ID) of the network namespace that will be used for the container.
NetworkNamespace string `json:"networkNamespace,omitempty"`
}

// WindowsHyperV contains information for configuring a container to run with Hyper-V isolation.
Expand Down

0 comments on commit eba862d

Please sign in to comment.