diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-28 07:19:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-28 07:19:34 -0700 |
| commit | ef1b58e6f28d21959196d29d5e9ab065d4e9a818 (patch) | |
| tree | 691ecc024dfedff5695e426a8f3a6c077cfc34b8 /libpod/container_internal_linux.go | |
| parent | e7a2eecf5f3975edfb92cd2cacff0d34ef45f808 (diff) | |
| parent | a5443a532b0fc6bd787cbb472c0ad2f75447c9df (diff) | |
| download | podman-ef1b58e6f28d21959196d29d5e9ab065d4e9a818.tar.gz podman-ef1b58e6f28d21959196d29d5e9ab065d4e9a818.tar.bz2 podman-ef1b58e6f28d21959196d29d5e9ab065d4e9a818.zip | |
Merge pull request #2789 from vrothberg/vendor
vendor buildah, image, storage, cni
Diffstat (limited to 'libpod/container_internal_linux.go')
| -rw-r--r-- | libpod/container_internal_linux.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index 02f8d6aa4..23de1aa01 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -820,7 +820,7 @@ func (c *Container) makeBindMounts() error { } // Add Secret Mounts - secretMounts := secrets.SecretMountsWithUIDGID(c.config.MountLabel, c.state.RunDir, c.runtime.config.DefaultMountsFile, c.state.DestinationRunDir, c.RootUID(), c.RootGID()) + secretMounts := secrets.SecretMountsWithUIDGID(c.config.MountLabel, c.state.RunDir, c.runtime.config.DefaultMountsFile, c.state.DestinationRunDir, c.RootUID(), c.RootGID(), rootless.IsRootless()) for _, mount := range secretMounts { if _, ok := c.state.BindMounts[mount.Destination]; !ok { c.state.BindMounts[mount.Destination] = mount.Source |