summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorUrvashi Mohnani <umohnani@redhat.com>2019-11-01 09:37:05 -0400
committerUrvashi Mohnani <umohnani@redhat.com>2019-11-01 09:41:09 -0400
commit2a149ad90ab3ae5b4e4128473d705d026351f0f5 (patch)
tree3af7cfb4dedef5d4b57bae29fe06aba76c47633e /libpod
parent69165fa04d9db306809a0b110491f9a572f74431 (diff)
downloadpodman-2a149ad90ab3ae5b4e4128473d705d026351f0f5.tar.gz
podman-2a149ad90ab3ae5b4e4128473d705d026351f0f5.tar.bz2
podman-2a149ad90ab3ae5b4e4128473d705d026351f0f5.zip
Vendor in latest containers/buildah
Pull in changes to pkg/secrets/secrets.go that adds the logic to disable fips mode if a pod/container has a label set. Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
Diffstat (limited to 'libpod')
-rw-r--r--libpod/container_internal_linux.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go
index 94184b6eb..471648bc8 100644
--- a/libpod/container_internal_linux.go
+++ b/libpod/container_internal_linux.go
@@ -1088,7 +1088,7 @@ func (c *Container) makeBindMounts() error {
}
// Add Secret Mounts
- secretMounts := secrets.SecretMountsWithUIDGID(c.config.MountLabel, c.state.RunDir, c.runtime.config.DefaultMountsFile, c.state.RunDir, c.RootUID(), c.RootGID(), rootless.IsRootless())
+ secretMounts := secrets.SecretMountsWithUIDGID(c.config.MountLabel, c.state.RunDir, c.runtime.config.DefaultMountsFile, c.state.RunDir, c.RootUID(), c.RootGID(), rootless.IsRootless(), false)
for _, mount := range secretMounts {
if _, ok := c.state.BindMounts[mount.Destination]; !ok {
c.state.BindMounts[mount.Destination] = mount.Source