summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-05-21 17:05:11 +0200
committerGitHub <noreply@github.com>2020-05-21 17:05:11 +0200
commitfeb97bb1058bf930dfef3b177b359bf3b41a7e64 (patch)
tree7d3f5abaafd03ed88e7e16d2f52d3f38b6ba0070
parente395a8ba524a9a3b2ad664bc8a9b108374762035 (diff)
parent35829854a24133f5f6900f6ee252d154dd742a15 (diff)
downloadpodman-feb97bb1058bf930dfef3b177b359bf3b41a7e64.tar.gz
podman-feb97bb1058bf930dfef3b177b359bf3b41a7e64.tar.bz2
podman-feb97bb1058bf930dfef3b177b359bf3b41a7e64.zip
Merge pull request #6281 from rhatdan/fips
Fix mountpont in SecretMountsWithUIDGID
-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 8ee0fb456..2bd6099f0 100644
--- a/libpod/container_internal_linux.go
+++ b/libpod/container_internal_linux.go
@@ -1236,7 +1236,7 @@ func (c *Container) makeBindMounts() error {
}
// Add Secret Mounts
- secretMounts := secrets.SecretMountsWithUIDGID(c.config.MountLabel, c.state.RunDir, c.runtime.config.Containers.DefaultMountsFile, c.state.RunDir, c.RootUID(), c.RootGID(), rootless.IsRootless(), false)
+ secretMounts := secrets.SecretMountsWithUIDGID(c.config.MountLabel, c.state.RunDir, c.runtime.config.Containers.DefaultMountsFile, c.state.Mountpoint, 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