summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorMatthew Heon <mheon@redhat.com>2021-02-23 13:55:47 -0500
committerMatthew Heon <mheon@redhat.com>2021-02-23 14:05:18 -0500
commitfc32ec768df8a59a9c438f38cf2fd2c08a77f94b (patch)
tree9f1b73bc58cffba709e5ea9de57120bd904e04ce /libpod
parent4dfcd585243b1695d36ac2a1a90dcb9818773511 (diff)
downloadpodman-fc32ec768df8a59a9c438f38cf2fd2c08a77f94b.tar.gz
podman-fc32ec768df8a59a9c438f38cf2fd2c08a77f94b.tar.bz2
podman-fc32ec768df8a59a9c438f38cf2fd2c08a77f94b.zip
Sort CapDrop in inspect to guarantee order
The order of CapAdd when inspecting containers is deterministic. However, the order of CapDrop is not (for unclear reasons). Add a quick sort on the final array to guarantee a consistent order. Fixes #9490 Signed-off-by: Matthew Heon <mheon@redhat.com>
Diffstat (limited to 'libpod')
-rw-r--r--libpod/container_inspect.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go
index 399eff845..e0569e2d4 100644
--- a/libpod/container_inspect.go
+++ b/libpod/container_inspect.go
@@ -2,6 +2,7 @@ package libpod
import (
"fmt"
+ "sort"
"strings"
"github.com/containers/common/pkg/config"
@@ -698,6 +699,8 @@ func (c *Container) generateInspectContainerHostConfig(ctrSpec *spec.Spec, named
for cap := range boundingCaps {
capDrop = append(capDrop, cap)
}
+ // Sort CapDrop so it displays in consistent order (GH #9490)
+ sort.Strings(capDrop)
}
hostConfig.CapAdd = capAdd
hostConfig.CapDrop = capDrop