diff options
Diffstat (limited to 'pkg')
-rw-r--r-- | pkg/hooks/0.1.0/hook.go | 4 | ||||
-rw-r--r-- | pkg/hooks/0.1.0/hook_test.go | 2 | ||||
-rw-r--r-- | pkg/hooks/hooks.go | 2 | ||||
-rw-r--r-- | pkg/hooks/hooks_test.go | 2 | ||||
-rw-r--r-- | pkg/hooks/read.go | 2 | ||||
-rw-r--r-- | pkg/hooks/read_test.go | 2 | ||||
-rw-r--r-- | pkg/registries/registries.go | 2 | ||||
-rw-r--r-- | pkg/secrets/secrets.go | 2 | ||||
-rw-r--r-- | pkg/spec/createconfig.go | 4 | ||||
-rw-r--r-- | pkg/spec/spec.go | 2 | ||||
-rw-r--r-- | pkg/varlinkapi/config.go | 4 | ||||
-rw-r--r-- | pkg/varlinkapi/containers.go | 6 | ||||
-rw-r--r-- | pkg/varlinkapi/containers_create.go | 12 | ||||
-rw-r--r-- | pkg/varlinkapi/images.go | 10 | ||||
-rw-r--r-- | pkg/varlinkapi/system.go | 4 | ||||
-rw-r--r-- | pkg/varlinkapi/util.go | 6 |
16 files changed, 33 insertions, 33 deletions
diff --git a/pkg/hooks/0.1.0/hook.go b/pkg/hooks/0.1.0/hook.go index e10c3d254..4ebc5ff9d 100644 --- a/pkg/hooks/0.1.0/hook.go +++ b/pkg/hooks/0.1.0/hook.go @@ -6,9 +6,9 @@ import ( "errors" "strings" + hooks "github.com/containers/libpod/pkg/hooks" + current "github.com/containers/libpod/pkg/hooks/1.0.0" rspec "github.com/opencontainers/runtime-spec/specs-go" - hooks "github.com/projectatomic/libpod/pkg/hooks" - current "github.com/projectatomic/libpod/pkg/hooks/1.0.0" ) // Version is the hook configuration version defined in this package. diff --git a/pkg/hooks/0.1.0/hook_test.go b/pkg/hooks/0.1.0/hook_test.go index 44cb21e3a..66774075e 100644 --- a/pkg/hooks/0.1.0/hook_test.go +++ b/pkg/hooks/0.1.0/hook_test.go @@ -3,8 +3,8 @@ package hook import ( "testing" + current "github.com/containers/libpod/pkg/hooks/1.0.0" rspec "github.com/opencontainers/runtime-spec/specs-go" - current "github.com/projectatomic/libpod/pkg/hooks/1.0.0" "github.com/stretchr/testify/assert" ) diff --git a/pkg/hooks/hooks.go b/pkg/hooks/hooks.go index fdc8a6c46..8a44a4982 100644 --- a/pkg/hooks/hooks.go +++ b/pkg/hooks/hooks.go @@ -7,9 +7,9 @@ import ( "path/filepath" "sync" + current "github.com/containers/libpod/pkg/hooks/1.0.0" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" - current "github.com/projectatomic/libpod/pkg/hooks/1.0.0" "github.com/sirupsen/logrus" "golang.org/x/text/collate" "golang.org/x/text/language" diff --git a/pkg/hooks/hooks_test.go b/pkg/hooks/hooks_test.go index b93a1d54d..2925a99e4 100644 --- a/pkg/hooks/hooks_test.go +++ b/pkg/hooks/hooks_test.go @@ -9,8 +9,8 @@ import ( "runtime" "testing" + current "github.com/containers/libpod/pkg/hooks/1.0.0" rspec "github.com/opencontainers/runtime-spec/specs-go" - current "github.com/projectatomic/libpod/pkg/hooks/1.0.0" "github.com/stretchr/testify/assert" "golang.org/x/text/language" ) diff --git a/pkg/hooks/read.go b/pkg/hooks/read.go index 20431bdf1..d3995a0be 100644 --- a/pkg/hooks/read.go +++ b/pkg/hooks/read.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strings" + current "github.com/containers/libpod/pkg/hooks/1.0.0" "github.com/pkg/errors" - current "github.com/projectatomic/libpod/pkg/hooks/1.0.0" "github.com/sirupsen/logrus" ) diff --git a/pkg/hooks/read_test.go b/pkg/hooks/read_test.go index 811cace23..606c25df4 100644 --- a/pkg/hooks/read_test.go +++ b/pkg/hooks/read_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "testing" + current "github.com/containers/libpod/pkg/hooks/1.0.0" rspec "github.com/opencontainers/runtime-spec/specs-go" - current "github.com/projectatomic/libpod/pkg/hooks/1.0.0" "github.com/stretchr/testify/assert" ) diff --git a/pkg/registries/registries.go b/pkg/registries/registries.go index c84bb21f6..73aa93d68 100644 --- a/pkg/registries/registries.go +++ b/pkg/registries/registries.go @@ -6,8 +6,8 @@ import ( "github.com/containers/image/pkg/sysregistries" "github.com/containers/image/types" + "github.com/containers/libpod/pkg/rootless" "github.com/pkg/errors" - "github.com/projectatomic/libpod/pkg/rootless" ) // userRegistriesFile is the path to the per user registry configuration file. diff --git a/pkg/secrets/secrets.go b/pkg/secrets/secrets.go index bc63ece00..6f38f1fd5 100644 --- a/pkg/secrets/secrets.go +++ b/pkg/secrets/secrets.go @@ -7,10 +7,10 @@ import ( "path/filepath" "strings" + "github.com/containers/libpod/pkg/rootless" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" - "github.com/projectatomic/libpod/pkg/rootless" "github.com/sirupsen/logrus" ) diff --git a/pkg/spec/createconfig.go b/pkg/spec/createconfig.go index fb45f042b..6df6fb480 100644 --- a/pkg/spec/createconfig.go +++ b/pkg/spec/createconfig.go @@ -7,6 +7,8 @@ import ( "strings" "syscall" + "github.com/containers/libpod/libpod" + "github.com/containers/libpod/pkg/rootless" "github.com/containers/storage" "github.com/cri-o/ocicni/pkg/ocicni" "github.com/docker/docker/api/types/container" @@ -15,8 +17,6 @@ import ( "github.com/opencontainers/runtime-tools/generate" "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" - "github.com/projectatomic/libpod/libpod" - "github.com/projectatomic/libpod/pkg/rootless" "github.com/sirupsen/logrus" "golang.org/x/sys/unix" ) diff --git a/pkg/spec/spec.go b/pkg/spec/spec.go index bceae4677..97305610a 100644 --- a/pkg/spec/spec.go +++ b/pkg/spec/spec.go @@ -4,13 +4,13 @@ import ( "os" "strings" + "github.com/containers/libpod/pkg/rootless" "github.com/docker/docker/daemon/caps" "github.com/docker/docker/pkg/mount" "github.com/docker/go-units" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/pkg/errors" - "github.com/projectatomic/libpod/pkg/rootless" "github.com/sirupsen/logrus" ) diff --git a/pkg/varlinkapi/config.go b/pkg/varlinkapi/config.go index fa1983463..8dd217b77 100644 --- a/pkg/varlinkapi/config.go +++ b/pkg/varlinkapi/config.go @@ -1,8 +1,8 @@ package varlinkapi import ( - iopodman "github.com/projectatomic/libpod/cmd/podman/varlink" - "github.com/projectatomic/libpod/libpod" + iopodman "github.com/containers/libpod/cmd/podman/varlink" + "github.com/containers/libpod/libpod" "github.com/urfave/cli" ) diff --git a/pkg/varlinkapi/containers.go b/pkg/varlinkapi/containers.go index f42386194..df8b66996 100644 --- a/pkg/varlinkapi/containers.go +++ b/pkg/varlinkapi/containers.go @@ -9,11 +9,11 @@ import ( "syscall" "time" + "github.com/containers/libpod/cmd/podman/batchcontainer" + "github.com/containers/libpod/cmd/podman/varlink" + "github.com/containers/libpod/libpod" "github.com/containers/storage/pkg/archive" "github.com/pkg/errors" - "github.com/projectatomic/libpod/cmd/podman/batchcontainer" - "github.com/projectatomic/libpod/cmd/podman/varlink" - "github.com/projectatomic/libpod/libpod" ) // ListContainers ... diff --git a/pkg/varlinkapi/containers_create.go b/pkg/varlinkapi/containers_create.go index 5f69a8205..e57f51cc1 100644 --- a/pkg/varlinkapi/containers_create.go +++ b/pkg/varlinkapi/containers_create.go @@ -8,14 +8,14 @@ import ( "strings" "syscall" + "github.com/containers/libpod/cmd/podman/varlink" + "github.com/containers/libpod/libpod" + "github.com/containers/libpod/libpod/image" + "github.com/containers/libpod/pkg/inspect" + cc "github.com/containers/libpod/pkg/spec" + "github.com/containers/libpod/pkg/util" "github.com/docker/docker/api/types/container" "github.com/docker/docker/pkg/signal" - "github.com/projectatomic/libpod/cmd/podman/varlink" - "github.com/projectatomic/libpod/libpod" - "github.com/projectatomic/libpod/libpod/image" - "github.com/projectatomic/libpod/pkg/inspect" - cc "github.com/projectatomic/libpod/pkg/spec" - "github.com/projectatomic/libpod/pkg/util" "github.com/sirupsen/logrus" ) diff --git a/pkg/varlinkapi/images.go b/pkg/varlinkapi/images.go index ae727d7ad..7953c1fc6 100644 --- a/pkg/varlinkapi/images.go +++ b/pkg/varlinkapi/images.go @@ -12,17 +12,17 @@ import ( "github.com/containers/image/docker" "github.com/containers/image/manifest" "github.com/containers/image/types" + "github.com/containers/libpod/cmd/podman/varlink" + "github.com/containers/libpod/libpod" + "github.com/containers/libpod/libpod/image" + sysreg "github.com/containers/libpod/pkg/registries" + "github.com/containers/libpod/pkg/util" "github.com/docker/go-units" "github.com/opencontainers/image-spec/specs-go/v1" "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "github.com/projectatomic/buildah" "github.com/projectatomic/buildah/imagebuildah" - "github.com/projectatomic/libpod/cmd/podman/varlink" - "github.com/projectatomic/libpod/libpod" - "github.com/projectatomic/libpod/libpod/image" - sysreg "github.com/projectatomic/libpod/pkg/registries" - "github.com/projectatomic/libpod/pkg/util" ) // ListImages lists all the images in the store diff --git a/pkg/varlinkapi/system.go b/pkg/varlinkapi/system.go index 042aef942..a90b72a6d 100644 --- a/pkg/varlinkapi/system.go +++ b/pkg/varlinkapi/system.go @@ -4,8 +4,8 @@ import ( goruntime "runtime" "strings" - "github.com/projectatomic/libpod/cmd/podman/varlink" - "github.com/projectatomic/libpod/libpod" + "github.com/containers/libpod/cmd/podman/varlink" + "github.com/containers/libpod/libpod" ) // GetVersion ... diff --git a/pkg/varlinkapi/util.go b/pkg/varlinkapi/util.go index 667c09562..b33e43f96 100644 --- a/pkg/varlinkapi/util.go +++ b/pkg/varlinkapi/util.go @@ -5,9 +5,9 @@ import ( "strconv" "time" - "github.com/projectatomic/libpod/cmd/podman/batchcontainer" - "github.com/projectatomic/libpod/cmd/podman/varlink" - "github.com/projectatomic/libpod/libpod" + "github.com/containers/libpod/cmd/podman/batchcontainer" + "github.com/containers/libpod/cmd/podman/varlink" + "github.com/containers/libpod/libpod" ) // getContext returns a non-nil, empty context |