diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-06 11:20:41 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-06 11:20:41 -0400 |
commit | 1a60550bef976a57777c75e055ad35ff8cf87f23 (patch) | |
tree | 0ddfcf25f83af0edd54ae3677634c2b14617f4c8 /pkg/domain/entities | |
parent | aa4ec20c0f0d495acf753a4040db48df8c918dc5 (diff) | |
parent | 2d74811520db30cba7246dd1122d484b0c02e5d7 (diff) | |
download | podman-1a60550bef976a57777c75e055ad35ff8cf87f23.tar.gz podman-1a60550bef976a57777c75e055ad35ff8cf87f23.tar.bz2 podman-1a60550bef976a57777c75e055ad35ff8cf87f23.zip |
Merge pull request #6865 from vrothberg/2.0-v2-module
[2.0] move go module to v2
Diffstat (limited to 'pkg/domain/entities')
-rw-r--r-- | pkg/domain/entities/container_ps.go | 2 | ||||
-rw-r--r-- | pkg/domain/entities/containers.go | 4 | ||||
-rw-r--r-- | pkg/domain/entities/engine_container.go | 4 | ||||
-rw-r--r-- | pkg/domain/entities/events.go | 2 | ||||
-rw-r--r-- | pkg/domain/entities/images.go | 4 | ||||
-rw-r--r-- | pkg/domain/entities/pods.go | 4 | ||||
-rw-r--r-- | pkg/domain/entities/system.go | 2 | ||||
-rw-r--r-- | pkg/domain/entities/types.go | 4 |
8 files changed, 13 insertions, 13 deletions
diff --git a/pkg/domain/entities/container_ps.go b/pkg/domain/entities/container_ps.go index 05627c4b3..b6f9e6892 100644 --- a/pkg/domain/entities/container_ps.go +++ b/pkg/domain/entities/container_ps.go @@ -4,7 +4,7 @@ import ( "sort" "strings" - "github.com/containers/libpod/pkg/ps/define" + "github.com/containers/libpod/v2/pkg/ps/define" "github.com/cri-o/ocicni/pkg/ocicni" "github.com/pkg/errors" ) diff --git a/pkg/domain/entities/containers.go b/pkg/domain/entities/containers.go index b4d8e6c29..78fbb6b43 100644 --- a/pkg/domain/entities/containers.go +++ b/pkg/domain/entities/containers.go @@ -7,8 +7,8 @@ import ( "time" "github.com/containers/image/v5/types" - "github.com/containers/libpod/libpod/define" - "github.com/containers/libpod/pkg/specgen" + "github.com/containers/libpod/v2/libpod/define" + "github.com/containers/libpod/v2/pkg/specgen" "github.com/cri-o/ocicni/pkg/ocicni" ) diff --git a/pkg/domain/entities/engine_container.go b/pkg/domain/entities/engine_container.go index 837550a2e..f8c72da58 100644 --- a/pkg/domain/entities/engine_container.go +++ b/pkg/domain/entities/engine_container.go @@ -4,8 +4,8 @@ import ( "context" "github.com/containers/common/pkg/config" - "github.com/containers/libpod/libpod/define" - "github.com/containers/libpod/pkg/specgen" + "github.com/containers/libpod/v2/libpod/define" + "github.com/containers/libpod/v2/pkg/specgen" "github.com/spf13/cobra" ) diff --git a/pkg/domain/entities/events.go b/pkg/domain/entities/events.go index 8861be158..05c8be34e 100644 --- a/pkg/domain/entities/events.go +++ b/pkg/domain/entities/events.go @@ -4,7 +4,7 @@ import ( "strconv" "time" - libpodEvents "github.com/containers/libpod/libpod/events" + libpodEvents "github.com/containers/libpod/v2/libpod/events" dockerEvents "github.com/docker/docker/api/types/events" ) diff --git a/pkg/domain/entities/images.go b/pkg/domain/entities/images.go index 81f52fef5..935fa38c2 100644 --- a/pkg/domain/entities/images.go +++ b/pkg/domain/entities/images.go @@ -5,8 +5,8 @@ import ( "github.com/containers/image/v5/manifest" "github.com/containers/image/v5/types" - "github.com/containers/libpod/pkg/inspect" - "github.com/containers/libpod/pkg/trust" + "github.com/containers/libpod/v2/pkg/inspect" + "github.com/containers/libpod/v2/pkg/trust" docker "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/opencontainers/go-digest" diff --git a/pkg/domain/entities/pods.go b/pkg/domain/entities/pods.go index fc76ddd41..8023034ef 100644 --- a/pkg/domain/entities/pods.go +++ b/pkg/domain/entities/pods.go @@ -5,8 +5,8 @@ import ( "strings" "time" - "github.com/containers/libpod/libpod/define" - "github.com/containers/libpod/pkg/specgen" + "github.com/containers/libpod/v2/libpod/define" + "github.com/containers/libpod/v2/pkg/specgen" ) type PodKillOptions struct { diff --git a/pkg/domain/entities/system.go b/pkg/domain/entities/system.go index 79a90be48..09446cffe 100644 --- a/pkg/domain/entities/system.go +++ b/pkg/domain/entities/system.go @@ -3,7 +3,7 @@ package entities import ( "time" - "github.com/containers/libpod/libpod/define" + "github.com/containers/libpod/v2/libpod/define" "github.com/docker/docker/api/types" "github.com/spf13/cobra" ) diff --git a/pkg/domain/entities/types.go b/pkg/domain/entities/types.go index 622f74838..7e910ff61 100644 --- a/pkg/domain/entities/types.go +++ b/pkg/domain/entities/types.go @@ -5,8 +5,8 @@ import ( "net" "github.com/containers/buildah/imagebuildah" - "github.com/containers/libpod/libpod/events" - "github.com/containers/libpod/pkg/specgen" + "github.com/containers/libpod/v2/libpod/events" + "github.com/containers/libpod/v2/pkg/specgen" "github.com/containers/storage/pkg/archive" ) |