diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-12-07 12:49:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-07 12:49:57 +0000 |
| commit | 23ce826a84db81b834ef62584b6d3ffb3e0084fd (patch) | |
| tree | d647ba1e6650f0a30656a8022acc74d5dea9323d /pkg/specgen/generate | |
| parent | 43077291ac8cafeea5b75ccbb37d929b079bf235 (diff) | |
| parent | 2130d185395b897798dcb1c17bbaf147dfb4da3c (diff) | |
| download | podman-23ce826a84db81b834ef62584b6d3ffb3e0084fd.tar.gz podman-23ce826a84db81b834ef62584b6d3ffb3e0084fd.tar.bz2 podman-23ce826a84db81b834ef62584b6d3ffb3e0084fd.zip | |
Merge pull request #12498 from rhatdan/cgroups
Update vendor or containers/common moving pkg/cgroups there
Diffstat (limited to 'pkg/specgen/generate')
| -rw-r--r-- | pkg/specgen/generate/oci.go | 2 | ||||
| -rw-r--r-- | pkg/specgen/generate/validate.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/specgen/generate/oci.go b/pkg/specgen/generate/oci.go index df5788099..9f8807915 100644 --- a/pkg/specgen/generate/oci.go +++ b/pkg/specgen/generate/oci.go @@ -6,10 +6,10 @@ import ( "strings" "github.com/containers/common/libimage" + "github.com/containers/common/pkg/cgroups" "github.com/containers/common/pkg/config" "github.com/containers/podman/v3/libpod" "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/cgroups" "github.com/containers/podman/v3/pkg/rootless" "github.com/containers/podman/v3/pkg/specgen" spec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/specgen/generate/validate.go b/pkg/specgen/generate/validate.go index b0d84825e..a44bf9979 100644 --- a/pkg/specgen/generate/validate.go +++ b/pkg/specgen/generate/validate.go @@ -4,8 +4,8 @@ import ( "os" "path/filepath" + "github.com/containers/common/pkg/cgroups" "github.com/containers/common/pkg/sysinfo" - "github.com/containers/podman/v3/pkg/cgroups" "github.com/containers/podman/v3/pkg/specgen" "github.com/containers/podman/v3/utils" "github.com/pkg/errors" |