5dbfedf3f9
`filters.ToParam()` and `filters.FromParam()` were deprecated in favor of `filters.ToJSON()` and `filters.FromJSON()` in 065118390a3ecaf0dbd2fa752d54d43f8f1e8ec6, but still used in various locations. This patch replaces uses of `filters.ToParam()` and `filters.FromParam()` with `filters.ToJSON()` and `filters.FromJSON()`. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: a4efe66cf2a7648dbcf5b9993bf351925b905b5b Component: engine
35 lines
781 B
Go
35 lines
781 B
Go
package client
|
|
|
|
import (
|
|
"net/url"
|
|
"regexp"
|
|
|
|
"github.com/docker/docker/api/types/filters"
|
|
)
|
|
|
|
var headerRegexp = regexp.MustCompile(`\ADocker/.+\s\((.+)\)\z`)
|
|
|
|
// getDockerOS returns the operating system based on the server header from the daemon.
|
|
func getDockerOS(serverHeader string) string {
|
|
var osType string
|
|
matches := headerRegexp.FindStringSubmatch(serverHeader)
|
|
if len(matches) > 0 {
|
|
osType = matches[1]
|
|
}
|
|
return osType
|
|
}
|
|
|
|
// getFiltersQuery returns a url query with "filters" query term, based on the
|
|
// filters provided.
|
|
func getFiltersQuery(f filters.Args) (url.Values, error) {
|
|
query := url.Values{}
|
|
if f.Len() > 0 {
|
|
filterJSON, err := filters.ToJSON(f)
|
|
if err != nil {
|
|
return query, err
|
|
}
|
|
query.Set("filters", filterJSON)
|
|
}
|
|
return query, nil
|
|
}
|