diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-31 09:28:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-31 09:28:41 -0400 |
| commit | b55a0ce42eb836b8d4a7091ea8bdd82e58f8352b (patch) | |
| tree | f120dd0db970fc02235bf7a92a9fdea9258e84e6 /pkg | |
| parent | eea6bd1cf45746e754e2cceb76f8eb638bcad718 (diff) | |
| parent | c95d2856f86cd8d85284e0b5adf2dd221173c268 (diff) | |
| download | podman-b55a0ce42eb836b8d4a7091ea8bdd82e58f8352b.tar.gz podman-b55a0ce42eb836b8d4a7091ea8bdd82e58f8352b.tar.bz2 podman-b55a0ce42eb836b8d4a7091ea8bdd82e58f8352b.zip | |
Merge pull request #7166 from vrothberg/2.0-backports
2.0 backports
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/api/handlers/compat/info.go | 2 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/images.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/api/handlers/compat/info.go b/pkg/api/handlers/compat/info.go index 6c44393cc..c0033eab4 100644 --- a/pkg/api/handlers/compat/info.go +++ b/pkg/api/handlers/compat/info.go @@ -119,7 +119,7 @@ func GetInfo(w http.ResponseWriter, r *http.Request) { BuildahVersion: infoData.Host.BuildahVersion, CPURealtimePeriod: sysInfo.CPURealtimePeriod, CPURealtimeRuntime: sysInfo.CPURealtimeRuntime, - CgroupVersion: infoData.Host.CGroupsVersion, + CgroupVersion: strings.TrimPrefix(infoData.Host.CGroupsVersion, "v"), Rootless: rootless.IsRootless(), SwapFree: infoData.Host.SwapFree, SwapTotal: infoData.Host.SwapTotal, diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go index 3393275b8..9f594d728 100644 --- a/pkg/domain/infra/abi/images.go +++ b/pkg/domain/infra/abi/images.go @@ -402,7 +402,7 @@ func (ir *ImageEngine) Search(ctx context.Context, term string, opts entities.Im for i := range searchResults { reports[i].Index = searchResults[i].Index reports[i].Name = searchResults[i].Name - reports[i].Description = searchResults[i].Index + reports[i].Description = searchResults[i].Description reports[i].Stars = searchResults[i].Stars reports[i].Official = searchResults[i].Official reports[i].Automated = searchResults[i].Automated |