diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-01 14:31:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-01 14:31:35 +0100 |
| commit | 9ae12f84e8d4704fe4c303fdedb12be8e4e73f59 (patch) | |
| tree | 514060252453dedc07116160cb49e53cdf922ec5 /libpod | |
| parent | ca612a3407eeecfedc38b629731f1e7a0105020f (diff) | |
| parent | 20160af01822138bab919437c43a3f3ad4849da8 (diff) | |
| download | podman-9ae12f84e8d4704fe4c303fdedb12be8e4e73f59.tar.gz podman-9ae12f84e8d4704fe4c303fdedb12be8e4e73f59.tar.bz2 podman-9ae12f84e8d4704fe4c303fdedb12be8e4e73f59.zip | |
Merge pull request #8475 from rhatdan/subscriptions
Switch from pkg/secrets to pkg/subscriptions
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container_internal_linux.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index b81f3f716..56575c195 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -22,9 +22,9 @@ import ( cnitypes "github.com/containernetworking/cni/pkg/types/current" "github.com/containernetworking/plugins/pkg/ns" "github.com/containers/buildah/pkg/overlay" - "github.com/containers/buildah/pkg/secrets" "github.com/containers/common/pkg/apparmor" "github.com/containers/common/pkg/config" + "github.com/containers/common/pkg/subscriptions" "github.com/containers/podman/v2/libpod/define" "github.com/containers/podman/v2/libpod/events" "github.com/containers/podman/v2/pkg/annotations" @@ -1435,7 +1435,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.Mountpoint, c.RootUID(), c.RootGID(), rootless.IsRootless(), false) + secretMounts := subscriptions.MountsWithUIDGID(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 |