From 435f61f497beb19816c8dc800309081ccef2cda9 Mon Sep 17 00:00:00 2001 From: Petr Sakař Date: Fri, 20 Nov 2020 17:48:16 +0100 Subject: APIv2 - strip CAP_ prefix from capabilities in json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit strip prefix "CAP_" from capabilities in json generated by container inspect operation Signed-off-by: Petr Sakař --- pkg/api/handlers/compat/containers.go | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'pkg/api') diff --git a/pkg/api/handlers/compat/containers.go b/pkg/api/handlers/compat/containers.go index 00be8e845..0ee96b855 100644 --- a/pkg/api/handlers/compat/containers.go +++ b/pkg/api/handlers/compat/containers.go @@ -298,6 +298,9 @@ func LibpodToContainerJSON(l *libpod.Container, sz bool) (*types.ContainerJSON, state.Running = true } + formatCapabilities(inspect.HostConfig.CapDrop) + formatCapabilities(inspect.HostConfig.CapAdd) + h, err := json.Marshal(inspect.HostConfig) if err != nil { return nil, err @@ -428,3 +431,9 @@ func LibpodToContainerJSON(l *libpod.Container, sz bool) (*types.ContainerJSON, } return &c, nil } + +func formatCapabilities(slice []string) { + for i := range slice { + slice[i] = strings.TrimPrefix(slice[i], "CAP_") + } +} -- cgit v1.2.3-54-g00ecf