diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-07-21 09:19:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-21 09:19:46 +0200 |
| commit | 0de7e4662e6d574fe382714cb6664a4519771f88 (patch) | |
| tree | c6b2d8db88f30f99a344fa0e7af356404f89c191 /libpod | |
| parent | 039deece50525b1fc812890dfa1ce2fa1f4c98b3 (diff) | |
| parent | 8d190fc481ff33b730b7fb8a5579f5760574e4cf (diff) | |
| download | podman-0de7e4662e6d574fe382714cb6664a4519771f88.tar.gz podman-0de7e4662e6d574fe382714cb6664a4519771f88.tar.bz2 podman-0de7e4662e6d574fe382714cb6664a4519771f88.zip | |
Merge pull request #14907 from flouthoc/remove-hooks
pkg,libpod: remove `pkg/hooks` and use `hooks` from `c/common`
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container_internal.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go index caf7f3849..7e330430c 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -22,12 +22,12 @@ import ( "github.com/containers/common/pkg/cgroups" "github.com/containers/common/pkg/chown" "github.com/containers/common/pkg/config" + "github.com/containers/common/pkg/hooks" + "github.com/containers/common/pkg/hooks/exec" cutil "github.com/containers/common/pkg/util" "github.com/containers/podman/v4/libpod/define" "github.com/containers/podman/v4/libpod/events" "github.com/containers/podman/v4/pkg/ctime" - "github.com/containers/podman/v4/pkg/hooks" - "github.com/containers/podman/v4/pkg/hooks/exec" "github.com/containers/podman/v4/pkg/lookup" "github.com/containers/podman/v4/pkg/rootless" "github.com/containers/podman/v4/pkg/selinux" |