Merge pull request #29228 from ashley-cui/is-automated
Some checks are pending
ci / path-filter (push) Waiting to run
ci / Validate source code changes (push) Waiting to run
ci / Cross Build (Linux, FreeBSD) (push) Waiting to run
ci / build debian-sid (push) Waiting to run
ci / build fedora-current (push) Waiting to run
ci / build fedora-prior (push) Waiting to run
ci / build fedora-rawhide (push) Waiting to run
ci / windows installer hyperv (push) Waiting to run
ci / windows installer wsl (push) Waiting to run
ci / macos installer (push) Waiting to run
ci / int local root debian-sid (push) Blocked by required conditions
ci / sys local root debian-sid (push) Blocked by required conditions
ci / int local rootless debian-sid (push) Blocked by required conditions
ci / sys local rootless debian-sid (push) Blocked by required conditions
ci / int remote root debian-sid (push) Blocked by required conditions
ci / sys remote root debian-sid (push) Blocked by required conditions
ci / bud local root fedora-current (push) Blocked by required conditions
ci / int local root fedora-current (push) Blocked by required conditions
ci / sys local root fedora-current (push) Blocked by required conditions
ci / int local rootless fedora-current (push) Blocked by required conditions
ci / sys local rootless fedora-current (push) Blocked by required conditions
ci / bud remote root fedora-current (push) Blocked by required conditions
ci / int remote root fedora-current (push) Blocked by required conditions
ci / sys remote root fedora-current (push) Blocked by required conditions
ci / int remote rootless fedora-current (push) Blocked by required conditions
ci / sys remote rootless fedora-current (push) Blocked by required conditions
ci / int local root fedora-prior (push) Blocked by required conditions
ci / sys local root fedora-prior (push) Blocked by required conditions
ci / int local rootless fedora-prior (push) Blocked by required conditions
ci / sys local rootless fedora-prior (push) Blocked by required conditions
ci / int remote root fedora-prior (push) Blocked by required conditions
ci / sys remote root fedora-prior (push) Blocked by required conditions
ci / int local root fedora-rawhide (push) Blocked by required conditions
ci / sys local root fedora-rawhide (push) Blocked by required conditions
ci / int local rootless fedora-rawhide (push) Blocked by required conditions
ci / sys local rootless fedora-rawhide (push) Blocked by required conditions
ci / int remote root fedora-rawhide (push) Blocked by required conditions
ci / sys remote root fedora-rawhide (push) Blocked by required conditions
ci / apiv2 root fedora-current (push) Blocked by required conditions
ci / bindings root fedora-current (push) Blocked by required conditions
ci / compose_v2 root fedora-current (push) Blocked by required conditions
ci / docker_py root fedora-current (push) Blocked by required conditions
ci / unit root fedora-current (push) Blocked by required conditions
ci / apiv2 rootless fedora-current (push) Blocked by required conditions
ci / compose_v2 rootless fedora-current (push) Blocked by required conditions
ci / unit rootless fedora-current (push) Blocked by required conditions
ci / upgrade v5.3.1 root fedora-current (push) Blocked by required conditions
ci / upgrade v5.6.2 root fedora-current (push) Blocked by required conditions
ci / machine linux amd64 (push) Blocked by required conditions
ci / windows unit (push) Blocked by required conditions
ci / windows e2e (push) Blocked by required conditions
ci / windows machine hyperv (push) Blocked by required conditions
ci / windows machine wsl (push) Blocked by required conditions
ci / macos machine applehv (push) Blocked by required conditions
ci / macos machine libkrun (push) Blocked by required conditions
ci / Total Success (push) Blocked by required conditions
zizmor: GitHub Actions Security Analysis / Zizmor (push) Waiting to run

Docker compat v1.45 : deprecate is-automated field
This commit is contained in:
Paul Holzinger 2026-07-28 12:39:25 +02:00 committed by GitHub
commit 8abafe40fc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -10,6 +10,7 @@ import (
"go.podman.io/image/v5/types"
"go.podman.io/podman/v6/libpod"
"go.podman.io/podman/v6/pkg/api/handlers/utils"
"go.podman.io/podman/v6/pkg/api/handlers/utils/apiutil"
api "go.podman.io/podman/v6/pkg/api/types"
"go.podman.io/podman/v6/pkg/auth"
"go.podman.io/podman/v6/pkg/domain/entities"
@ -49,6 +50,22 @@ func SearchImages(w http.ResponseWriter, r *http.Request) {
password = authconf.Password
idToken = authconf.IdentityToken
}
// compat v1.45 deprecation: searching for is-automated=true will yield no results, while is-automated=false will be a no-op.
isAutomatedDeprecated := false
if _, err := apiutil.SupportedVersion(r, ">=1.45.0"); err == nil {
if !utils.IsLibpodRequest(r) {
isAutomatedDeprecated = true
if vals, ok := query.Filters["is-automated"]; ok {
switch vals[0] {
case "true":
utils.WriteResponse(w, http.StatusOK, []registry.SearchResult{})
return
case "false":
delete(query.Filters, "is-automated")
}
}
}
}
filters := []string{}
for key, val := range query.Filters {
@ -79,14 +96,19 @@ func SearchImages(w http.ResponseWriter, r *http.Request) {
return
}
compatResults := make([]registry.SearchResult, len(reports))
for i, r := range reports {
compatResults[i] = registry.SearchResult{
Name: r.Name,
Description: r.Description,
StarCount: r.Stars,
IsOfficial: toBool(r.Official),
IsAutomated: toBool(r.Automated),
for i, report := range reports {
result := registry.SearchResult{
Name: report.Name,
Description: report.Description,
StarCount: report.Stars,
IsOfficial: toBool(report.Official),
IsAutomated: toBool(report.Automated),
}
if isAutomatedDeprecated {
//nolint:staticcheck
result.IsAutomated = false
}
compatResults[i] = result
}
utils.WriteResponse(w, http.StatusOK, compatResults)
return