summaryrefslogtreecommitdiff
path: root/pkg/specgen
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2020-07-06 15:38:20 +0200
committerValentin Rothberg <rothberg@redhat.com>2020-07-06 15:50:12 +0200
commit8489dc43458da43d12ae37bac63753811acf96d9 (patch)
treec2dce0ff4c9f1a00f2f78da106da510c84756866 /pkg/specgen
parent9bccb0f091a82656593a069891f143e78a8719e9 (diff)
downloadpodman-8489dc43458da43d12ae37bac63753811acf96d9.tar.gz
podman-8489dc43458da43d12ae37bac63753811acf96d9.tar.bz2
podman-8489dc43458da43d12ae37bac63753811acf96d9.zip
move go module to v2
With the advent of Podman 2.0.0 we crossed the magical barrier of go modules. While we were able to continue importing all packages inside of the project, the project could not be vendored anymore from the outside. Move the go module to new major version and change all imports to `github.com/containers/libpod/v2`. The renaming of the imports was done via `gomove` [1]. [1] https://github.com/KSubedi/gomove Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'pkg/specgen')
-rw-r--r--pkg/specgen/config_unsupported.go2
-rw-r--r--pkg/specgen/container_validate.go4
-rw-r--r--pkg/specgen/generate/config_linux.go2
-rw-r--r--pkg/specgen/generate/config_linux_cgo.go6
-rw-r--r--pkg/specgen/generate/config_linux_nocgo.go4
-rw-r--r--pkg/specgen/generate/container.go12
-rw-r--r--pkg/specgen/generate/container_create.go8
-rw-r--r--pkg/specgen/generate/namespaces.go12
-rw-r--r--pkg/specgen/generate/oci.go10
-rw-r--r--pkg/specgen/generate/pod_create.go4
-rw-r--r--pkg/specgen/generate/ports.go4
-rw-r--r--pkg/specgen/generate/security.go8
-rw-r--r--pkg/specgen/generate/storage.go8
-rw-r--r--pkg/specgen/generate/validate.go4
-rw-r--r--pkg/specgen/namespaces.go4
-rw-r--r--pkg/specgen/pod_validate.go2
16 files changed, 47 insertions, 47 deletions
diff --git a/pkg/specgen/config_unsupported.go b/pkg/specgen/config_unsupported.go
index c2d3257c9..6b6ba6181 100644
--- a/pkg/specgen/config_unsupported.go
+++ b/pkg/specgen/config_unsupported.go
@@ -3,7 +3,7 @@
package specgen
import (
- "github.com/containers/libpod/libpod/image"
+ "github.com/containers/libpod/v2/libpod/image"
spec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
)
diff --git a/pkg/specgen/container_validate.go b/pkg/specgen/container_validate.go
index 33bacecaf..8063bee38 100644
--- a/pkg/specgen/container_validate.go
+++ b/pkg/specgen/container_validate.go
@@ -3,8 +3,8 @@ package specgen
import (
"strings"
- "github.com/containers/libpod/pkg/rootless"
- "github.com/containers/libpod/pkg/util"
+ "github.com/containers/libpod/v2/pkg/rootless"
+ "github.com/containers/libpod/v2/pkg/util"
"github.com/pkg/errors"
)
diff --git a/pkg/specgen/generate/config_linux.go b/pkg/specgen/generate/config_linux.go
index f4cf0c704..5d928cc5d 100644
--- a/pkg/specgen/generate/config_linux.go
+++ b/pkg/specgen/generate/config_linux.go
@@ -7,7 +7,7 @@ import (
"path/filepath"
"strings"
- "github.com/containers/libpod/pkg/rootless"
+ "github.com/containers/libpod/v2/pkg/rootless"
"github.com/opencontainers/runc/libcontainer/configs"
"github.com/opencontainers/runc/libcontainer/devices"
spec "github.com/opencontainers/runtime-spec/specs-go"
diff --git a/pkg/specgen/generate/config_linux_cgo.go b/pkg/specgen/generate/config_linux_cgo.go
index 5d629a6e6..7ea4278a2 100644
--- a/pkg/specgen/generate/config_linux_cgo.go
+++ b/pkg/specgen/generate/config_linux_cgo.go
@@ -6,9 +6,9 @@ import (
"context"
"io/ioutil"
- "github.com/containers/libpod/libpod/image"
- "github.com/containers/libpod/pkg/seccomp"
- "github.com/containers/libpod/pkg/specgen"
+ "github.com/containers/libpod/v2/libpod/image"
+ "github.com/containers/libpod/v2/pkg/seccomp"
+ "github.com/containers/libpod/v2/pkg/specgen"
spec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
goSeccomp "github.com/seccomp/containers-golang"
diff --git a/pkg/specgen/generate/config_linux_nocgo.go b/pkg/specgen/generate/config_linux_nocgo.go
index 81d1c7011..8afd2f9dc 100644
--- a/pkg/specgen/generate/config_linux_nocgo.go
+++ b/pkg/specgen/generate/config_linux_nocgo.go
@@ -5,8 +5,8 @@ package generate
import (
"errors"
- "github.com/containers/libpod/libpod/image"
- "github.com/containers/libpod/pkg/specgen"
+ "github.com/containers/libpod/v2/libpod/image"
+ "github.com/containers/libpod/v2/pkg/specgen"
spec "github.com/opencontainers/runtime-spec/specs-go"
)
diff --git a/pkg/specgen/generate/container.go b/pkg/specgen/generate/container.go
index df27f225b..dee79cf67 100644
--- a/pkg/specgen/generate/container.go
+++ b/pkg/specgen/generate/container.go
@@ -4,12 +4,12 @@ import (
"context"
"github.com/containers/image/v5/manifest"
- "github.com/containers/libpod/libpod"
- "github.com/containers/libpod/libpod/image"
- ann "github.com/containers/libpod/pkg/annotations"
- envLib "github.com/containers/libpod/pkg/env"
- "github.com/containers/libpod/pkg/signal"
- "github.com/containers/libpod/pkg/specgen"
+ "github.com/containers/libpod/v2/libpod"
+ "github.com/containers/libpod/v2/libpod/image"
+ ann "github.com/containers/libpod/v2/pkg/annotations"
+ envLib "github.com/containers/libpod/v2/pkg/env"
+ "github.com/containers/libpod/v2/pkg/signal"
+ "github.com/containers/libpod/v2/pkg/specgen"
"github.com/pkg/errors"
"golang.org/x/sys/unix"
)
diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go
index 7b4fbebf4..2b84aa8c5 100644
--- a/pkg/specgen/generate/container_create.go
+++ b/pkg/specgen/generate/container_create.go
@@ -6,10 +6,10 @@ import (
"path/filepath"
"github.com/containers/common/pkg/config"
- "github.com/containers/libpod/libpod"
- "github.com/containers/libpod/libpod/image"
- "github.com/containers/libpod/pkg/specgen"
- "github.com/containers/libpod/pkg/util"
+ "github.com/containers/libpod/v2/libpod"
+ "github.com/containers/libpod/v2/libpod/image"
+ "github.com/containers/libpod/v2/pkg/specgen"
+ "github.com/containers/libpod/v2/pkg/util"
"github.com/containers/storage"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
diff --git a/pkg/specgen/generate/namespaces.go b/pkg/specgen/generate/namespaces.go
index 3815bbcc9..566830cd8 100644
--- a/pkg/specgen/generate/namespaces.go
+++ b/pkg/specgen/generate/namespaces.go
@@ -6,12 +6,12 @@ import (
"strings"
"github.com/containers/common/pkg/config"
- "github.com/containers/libpod/libpod"
- "github.com/containers/libpod/libpod/define"
- "github.com/containers/libpod/libpod/image"
- "github.com/containers/libpod/pkg/rootless"
- "github.com/containers/libpod/pkg/specgen"
- "github.com/containers/libpod/pkg/util"
+ "github.com/containers/libpod/v2/libpod"
+ "github.com/containers/libpod/v2/libpod/define"
+ "github.com/containers/libpod/v2/libpod/image"
+ "github.com/containers/libpod/v2/pkg/rootless"
+ "github.com/containers/libpod/v2/pkg/specgen"
+ "github.com/containers/libpod/v2/pkg/util"
spec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/opencontainers/runtime-tools/generate"
"github.com/pkg/errors"
diff --git a/pkg/specgen/generate/oci.go b/pkg/specgen/generate/oci.go
index badb34999..0a485e7cd 100644
--- a/pkg/specgen/generate/oci.go
+++ b/pkg/specgen/generate/oci.go
@@ -5,11 +5,11 @@ import (
"strings"
"github.com/containers/common/pkg/config"
- "github.com/containers/libpod/libpod"
- "github.com/containers/libpod/libpod/define"
- "github.com/containers/libpod/libpod/image"
- "github.com/containers/libpod/pkg/rootless"
- "github.com/containers/libpod/pkg/specgen"
+ "github.com/containers/libpod/v2/libpod"
+ "github.com/containers/libpod/v2/libpod/define"
+ "github.com/containers/libpod/v2/libpod/image"
+ "github.com/containers/libpod/v2/pkg/rootless"
+ "github.com/containers/libpod/v2/pkg/specgen"
"github.com/opencontainers/runc/libcontainer/user"
spec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/opencontainers/runtime-tools/generate"
diff --git a/pkg/specgen/generate/pod_create.go b/pkg/specgen/generate/pod_create.go
index 5ccb1ba80..690651a23 100644
--- a/pkg/specgen/generate/pod_create.go
+++ b/pkg/specgen/generate/pod_create.go
@@ -3,8 +3,8 @@ package generate
import (
"context"
- "github.com/containers/libpod/libpod"
- "github.com/containers/libpod/pkg/specgen"
+ "github.com/containers/libpod/v2/libpod"
+ "github.com/containers/libpod/v2/pkg/specgen"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
)
diff --git a/pkg/specgen/generate/ports.go b/pkg/specgen/generate/ports.go
index 5c06d3bc3..9412ecfbf 100644
--- a/pkg/specgen/generate/ports.go
+++ b/pkg/specgen/generate/ports.go
@@ -6,8 +6,8 @@ import (
"strconv"
"strings"
- "github.com/containers/libpod/libpod/image"
- "github.com/containers/libpod/pkg/specgen"
+ "github.com/containers/libpod/v2/libpod/image"
+ "github.com/containers/libpod/v2/pkg/specgen"
"github.com/cri-o/ocicni/pkg/ocicni"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
diff --git a/pkg/specgen/generate/security.go b/pkg/specgen/generate/security.go
index f3821d1f7..70493cd5f 100644
--- a/pkg/specgen/generate/security.go
+++ b/pkg/specgen/generate/security.go
@@ -5,10 +5,10 @@ import (
"github.com/containers/common/pkg/capabilities"
"github.com/containers/common/pkg/config"
- "github.com/containers/libpod/libpod"
- "github.com/containers/libpod/libpod/image"
- "github.com/containers/libpod/pkg/specgen"
- "github.com/containers/libpod/pkg/util"
+ "github.com/containers/libpod/v2/libpod"
+ "github.com/containers/libpod/v2/libpod/image"
+ "github.com/containers/libpod/v2/pkg/specgen"
+ "github.com/containers/libpod/v2/pkg/util"
"github.com/opencontainers/runtime-tools/generate"
"github.com/opencontainers/selinux/go-selinux/label"
"github.com/pkg/errors"
diff --git a/pkg/specgen/generate/storage.go b/pkg/specgen/generate/storage.go
index 0d78421a6..f3b1a4e3d 100644
--- a/pkg/specgen/generate/storage.go
+++ b/pkg/specgen/generate/storage.go
@@ -9,10 +9,10 @@ import (
"strings"
"github.com/containers/common/pkg/config"
- "github.com/containers/libpod/libpod"
- "github.com/containers/libpod/libpod/image"
- "github.com/containers/libpod/pkg/specgen"
- "github.com/containers/libpod/pkg/util"
+ "github.com/containers/libpod/v2/libpod"
+ "github.com/containers/libpod/v2/libpod/image"
+ "github.com/containers/libpod/v2/pkg/specgen"
+ "github.com/containers/libpod/v2/pkg/util"
spec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
diff --git a/pkg/specgen/generate/validate.go b/pkg/specgen/generate/validate.go
index bb3ca9907..cd2f9ec22 100644
--- a/pkg/specgen/generate/validate.go
+++ b/pkg/specgen/generate/validate.go
@@ -2,8 +2,8 @@ package generate
import (
"github.com/containers/common/pkg/sysinfo"
- "github.com/containers/libpod/pkg/cgroups"
- "github.com/containers/libpod/pkg/specgen"
+ "github.com/containers/libpod/v2/pkg/cgroups"
+ "github.com/containers/libpod/v2/pkg/specgen"
"github.com/pkg/errors"
)
diff --git a/pkg/specgen/namespaces.go b/pkg/specgen/namespaces.go
index da1f8e8fc..5f56b242b 100644
--- a/pkg/specgen/namespaces.go
+++ b/pkg/specgen/namespaces.go
@@ -3,8 +3,8 @@ package specgen
import (
"strings"
- "github.com/containers/libpod/pkg/cgroups"
- "github.com/containers/libpod/pkg/rootless"
+ "github.com/containers/libpod/v2/pkg/cgroups"
+ "github.com/containers/libpod/v2/pkg/rootless"
"github.com/pkg/errors"
)
diff --git a/pkg/specgen/pod_validate.go b/pkg/specgen/pod_validate.go
index 2d57cdb91..070bb1e41 100644
--- a/pkg/specgen/pod_validate.go
+++ b/pkg/specgen/pod_validate.go
@@ -1,7 +1,7 @@
package specgen
import (
- "github.com/containers/libpod/pkg/util"
+ "github.com/containers/libpod/v2/pkg/util"
"github.com/pkg/errors"
)