diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-04-16 16:38:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-16 16:38:38 -0400 |
| commit | b9730d2e9b8cb7d7798929690fa020f180f2e1b2 (patch) | |
| tree | cbc1bebde8b80c8da472865fbe4a85a0146e59bf /pkg/specgen/generate/container_create.go | |
| parent | bd94d84fadda7000da78e36d9865949dc8e7adb4 (diff) | |
| parent | 9148568b2610c6d1fa03d90acf1f77f7bcea6ba4 (diff) | |
| download | podman-b9730d2e9b8cb7d7798929690fa020f180f2e1b2.tar.gz podman-b9730d2e9b8cb7d7798929690fa020f180f2e1b2.tar.bz2 podman-b9730d2e9b8cb7d7798929690fa020f180f2e1b2.zip | |
Merge pull request #10062 from mheon/bump_311
Bump to v3.1.1
Diffstat (limited to 'pkg/specgen/generate/container_create.go')
| -rw-r--r-- | pkg/specgen/generate/container_create.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go index 03697b353..1d724ffb0 100644 --- a/pkg/specgen/generate/container_create.go +++ b/pkg/specgen/generate/container_create.go @@ -11,7 +11,7 @@ import ( "github.com/containers/podman/v3/libpod/image" "github.com/containers/podman/v3/pkg/specgen" "github.com/containers/podman/v3/pkg/util" - "github.com/containers/storage" + "github.com/containers/storage/types" "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -367,7 +367,7 @@ func createContainerOptions(ctx context.Context, rt *libpod.Runtime, s *specgen. return options, nil } -func CreateExitCommandArgs(storageConfig storage.StoreOptions, config *config.Config, syslog, rm, exec bool) ([]string, error) { +func CreateExitCommandArgs(storageConfig types.StoreOptions, config *config.Config, syslog, rm, exec bool) ([]string, error) { // We need a cleanup process for containers in the current model. // But we can't assume that the caller is Podman - it could be another // user of the API. |