diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-05-24 13:48:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-24 13:48:50 -0400 |
| commit | eea7491d6b02893766b806775bf00c992a824fd2 (patch) | |
| tree | 131f4e27cebc82ee86de3bc7165dec0ec6857946 /libpod/container_internal_linux.go | |
| parent | c6152f40a0d083a894b03ea18f1fabd1b4b68852 (diff) | |
| parent | 5d37d80ff9783b2c811a06d80cd06fd6e338faf0 (diff) | |
| download | podman-eea7491d6b02893766b806775bf00c992a824fd2.tar.gz podman-eea7491d6b02893766b806775bf00c992a824fd2.tar.bz2 podman-eea7491d6b02893766b806775bf00c992a824fd2.zip | |
Merge pull request #14327 from rhatdan/common
Use containers/common/pkg/util.StringToSlice
Diffstat (limited to 'libpod/container_internal_linux.go')
| -rw-r--r-- | libpod/container_internal_linux.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index d7683cce9..82e5fa992 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -36,6 +36,7 @@ import ( "github.com/containers/common/pkg/config" "github.com/containers/common/pkg/subscriptions" "github.com/containers/common/pkg/umask" + cutil "github.com/containers/common/pkg/util" is "github.com/containers/image/v5/storage" "github.com/containers/podman/v4/libpod/define" "github.com/containers/podman/v4/libpod/events" @@ -393,7 +394,7 @@ func (c *Container) generateSpec(ctx context.Context) (*spec.Spec, error) { overrides := c.getUserOverrides() execUser, err := lookup.GetUserGroupInfo(c.state.Mountpoint, c.config.User, overrides) if err != nil { - if util.StringInSlice(c.config.User, c.config.HostUsers) { + if cutil.StringInSlice(c.config.User, c.config.HostUsers) { execUser, err = lookupHostUser(c.config.User) } if err != nil { @@ -2389,7 +2390,7 @@ func (c *Container) generateResolvConf() error { } if len(c.config.DNSSearch) > 0 || len(c.runtime.config.Containers.DNSSearches) > 0 { - if !util.StringInSlice(".", c.config.DNSSearch) { + if !cutil.StringInSlice(".", c.config.DNSSearch) { search = append(search, c.runtime.config.Containers.DNSSearches...) search = append(search, c.config.DNSSearch...) } |