summaryrefslogtreecommitdiff
path: root/pkg/specgen/generate
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2021-12-06 06:46:27 -0500
committerDaniel J Walsh <dwalsh@redhat.com>2021-12-07 06:17:11 -0500
commit2130d185395b897798dcb1c17bbaf147dfb4da3c (patch)
tree55458df21157cdfd632bc2ad7de4cb38dd969e01 /pkg/specgen/generate
parent2f11e2ac53269d2aafd0325e17e7c9bfda119dea (diff)
downloadpodman-2130d185395b897798dcb1c17bbaf147dfb4da3c.tar.gz
podman-2130d185395b897798dcb1c17bbaf147dfb4da3c.tar.bz2
podman-2130d185395b897798dcb1c17bbaf147dfb4da3c.zip
Update vendor or containers/common moving pkg/cgroups there
[NO NEW TESTS NEEDED] This is just moving pkg/cgroups out so existing tests should be fine. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg/specgen/generate')
-rw-r--r--pkg/specgen/generate/oci.go2
-rw-r--r--pkg/specgen/generate/validate.go2
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"