Skip to content

Commit

Permalink
Merge pull request opencontainers#815 from jhowardmsft/servicing
Browse files Browse the repository at this point in the history
Windows: Add servicing
  • Loading branch information
hqhq authored May 23, 2017
2 parents 76e8d06 + 3c0a84c commit 4a20bd2
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 1 deletion.
17 changes: 16 additions & 1 deletion config-windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,19 @@ For more information about tooling to generate a gMSA, see [Deployment Overview]


[gMSAOverview]: https://aka.ms/windowscontainers/manage-serviceaccounts
[gMSATooling]: https://aka.ms/windowscontainers/credentialspec-tools
[gMSATooling]: https://aka.ms/windowscontainers/credentialspec-tools


## <a name="configWindowsServicing" />Servicing

When a container terminates, the Host Compute Service indicates if a Windows update servicing operation is pending.
You can indicate that a container should be started in a mode to apply pending servicing operations via the OPTIONAL `servicing` field of the Windows configuration.


### Example

```json
"windows": {
"servicing": true
}
```
4 changes: 4 additions & 0 deletions schema/config-windows.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@
"credentialspec": {
"id": "https://opencontainers.org/schema/bundle/windows/credentialspec",
"type": "object"
},
"servicing": {
"id": "https://opencontainers.org/schema/bundle/windows/servicing",
"type": "boolean"
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions specs-go/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,8 @@ type Windows struct {
Resources *WindowsResources `json:"resources,omitempty"`
// CredentialSpec contains a JSON object describing a group Managed Service Account (gMSA) specification.
CredentialSpec interface{} `json:"credentialspec,omitempty"`
// Servicing indicates if the container is being started in a mode to apply a Windows Update servicing operation.
Servicing bool `json:"servicing,omitempty"`
}

// WindowsResources has container runtime resource constraints for containers running on Windows.
Expand Down

0 comments on commit 4a20bd2

Please sign in to comment.