From d20f3a51463ce75d139dd830e19a173906b0b0cb Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 16 Aug 2018 06:41:15 -0400 Subject: switch projectatomic to containers Need to get some small changes into libpod to pull back into buildah to complete buildah transition. Signed-off-by: Daniel J Walsh Closes: #1270 Approved by: mheon --- pkg/hooks/0.1.0/hook.go | 4 ++-- pkg/hooks/0.1.0/hook_test.go | 2 +- pkg/hooks/hooks.go | 2 +- pkg/hooks/hooks_test.go | 2 +- pkg/hooks/read.go | 2 +- pkg/hooks/read_test.go | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'pkg/hooks') 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" ) -- cgit v1.2.3-54-g00ecf