Merge pull request #10002 from jmguzik/prune-doc-update

Reflect current state of prune implementation in docs
This commit is contained in:
OpenShift Merge Robot
2021-04-13 01:50:25 -07:00
committed by GitHub
2 changed files with 10 additions and 3 deletions

View File

@ -377,7 +377,6 @@ func (s *APIServer) registerNetworkHandlers(r *mux.Router) error {
// name: filters // name: filters
// type: string // type: string
// description: | // description: |
// NOT IMPLEMENTED
// Filters to process on the prune list, encoded as JSON (a map[string][]string). // Filters to process on the prune list, encoded as JSON (a map[string][]string).
// Available filters: // Available filters:
// - until=<timestamp> Prune networks created before this timestamp. The <timestamp> can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. 10m, 1h30m) computed relative to the daemon machines time. // - until=<timestamp> Prune networks created before this timestamp. The <timestamp> can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. 10m, 1h30m) computed relative to the daemon machines time.

View File

@ -81,6 +81,14 @@ func (s *APIServer) registerVolumeHandlers(r *mux.Router) error {
// summary: Prune volumes // summary: Prune volumes
// produces: // produces:
// - application/json // - application/json
// parameters:
// - in: query
// name: filters
// type: string
// description: |
// JSON encoded value of filters (a map[string][]string) to match volumes against before pruning.
// Available filters:
// - label (label=<key>, label=<key>=<value>, label!=<key>, or label!=<key>=<value>) Prune volumes with (or without, in case label!=... is used) the specified labels.
// responses: // responses:
// '200': // '200':
// "$ref": "#/responses/VolumePruneResponse" // "$ref": "#/responses/VolumePruneResponse"
@ -259,8 +267,8 @@ func (s *APIServer) registerVolumeHandlers(r *mux.Router) error {
// type: string // type: string
// description: | // description: |
// JSON encoded value of filters (a map[string][]string) to match volumes against before pruning. // JSON encoded value of filters (a map[string][]string) to match volumes against before pruning.
// // Available filters:
// Note: No filters are currently supported and any filters specified will cause an error response. // - label (label=<key>, label=<key>=<value>, label!=<key>, or label!=<key>=<value>) Prune volumes with (or without, in case label!=... is used) the specified labels.
// responses: // responses:
// '200': // '200':
// "$ref": "#/responses/DockerVolumePruneResponse" // "$ref": "#/responses/DockerVolumePruneResponse"