diff --git a/README.md b/README.md index 094be6fd..fe00b72b 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Using the ORAS Go library, you can develop your own push/pull experience: `myclient push artifacts.azurecr.io/myartifact:1.0 ./mything.thang` -The package `github.com/oras-project/oras-go/pkg/oras` can quickly be imported in other Go-based tools that +The package `oras.land/oras-go` can quickly be imported in other Go-based tools that wish to benefit from the ability to store arbitrary content in container registries. ### ORAS Go Library Example @@ -26,11 +26,11 @@ import ( "context" "fmt" - "github.com/oras-project/oras-go/pkg/content" - "github.com/oras-project/oras-go/pkg/oras" - "github.com/containerd/containerd/remotes/docker" ocispec "github.com/opencontainers/image-spec/specs-go/v1" + + "oras.land/oras-go/pkg/content" + "oras.land/oras-go/pkg/oras" ) func check(e error) { diff --git a/examples/simple_push_pull.go b/examples/simple_push_pull.go index fa3bc3b8..a2008000 100644 --- a/examples/simple_push_pull.go +++ b/examples/simple_push_pull.go @@ -20,11 +20,11 @@ import ( "fmt" "os" - "github.com/oras-project/oras-go/pkg/content" - "github.com/oras-project/oras-go/pkg/oras" - "github.com/containerd/containerd/remotes/docker" ocispec "github.com/opencontainers/image-spec/specs-go/v1" + + "oras.land/oras-go/pkg/content" + "oras.land/oras-go/pkg/oras" ) func check(e error) { diff --git a/go.mod b/go.mod index 395e5ac5..8a06f9cf 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/oras-project/oras-go +module oras.land/oras-go go 1.16 diff --git a/pkg/auth/docker/client.go b/pkg/auth/docker/client.go index d91593ef..8303798f 100644 --- a/pkg/auth/docker/client.go +++ b/pkg/auth/docker/client.go @@ -18,12 +18,12 @@ package docker import ( "os" - "github.com/oras-project/oras-go/pkg/auth" - "github.com/docker/cli/cli/config" "github.com/docker/cli/cli/config/configfile" "github.com/docker/cli/cli/config/credentials" "github.com/pkg/errors" + + "oras.land/oras-go/pkg/auth" ) // Client provides authentication operations for docker registries. diff --git a/pkg/auth/docker/client_test.go b/pkg/auth/docker/client_test.go index d64433f0..af9bb7ca 100644 --- a/pkg/auth/docker/client_test.go +++ b/pkg/auth/docker/client_test.go @@ -33,7 +33,7 @@ import ( "github.com/stretchr/testify/suite" "golang.org/x/crypto/bcrypt" - iface "github.com/oras-project/oras-go/pkg/auth" + iface "oras.land/oras-go/pkg/auth" ) var ( diff --git a/pkg/auth/docker/login.go b/pkg/auth/docker/login.go index a1f3b3fc..4e1d1ee6 100644 --- a/pkg/auth/docker/login.go +++ b/pkg/auth/docker/login.go @@ -22,7 +22,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/registry" - iface "github.com/oras-project/oras-go/pkg/auth" + iface "oras.land/oras-go/pkg/auth" ) // Login logs in to a docker registry identified by the hostname. diff --git a/pkg/auth/docker/logout.go b/pkg/auth/docker/logout.go index f942b0ac..ada1f268 100644 --- a/pkg/auth/docker/logout.go +++ b/pkg/auth/docker/logout.go @@ -18,9 +18,9 @@ package docker import ( "context" - "github.com/oras-project/oras-go/pkg/auth" - "github.com/docker/cli/cli/config/configfile" + + "oras.land/oras-go/pkg/auth" ) // Logout logs out from a docker registry identified by the hostname. diff --git a/pkg/auth/docker/resolver.go b/pkg/auth/docker/resolver.go index 84999400..e749c2d2 100644 --- a/pkg/auth/docker/resolver.go +++ b/pkg/auth/docker/resolver.go @@ -24,7 +24,7 @@ import ( ctypes "github.com/docker/cli/cli/config/types" "github.com/docker/docker/registry" - iface "github.com/oras-project/oras-go/pkg/auth" + iface "oras.land/oras-go/pkg/auth" ) // Resolver returns a new authenticated resolver. diff --git a/pkg/content/decompressstore_test.go b/pkg/content/decompressstore_test.go index bab802f4..b69c2b8f 100644 --- a/pkg/content/decompressstore_test.go +++ b/pkg/content/decompressstore_test.go @@ -23,9 +23,10 @@ import ( "testing" ctrcontent "github.com/containerd/containerd/content" - "github.com/oras-project/oras-go/pkg/content" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" + + "oras.land/oras-go/pkg/content" ) func TestDecompressStore(t *testing.T) { diff --git a/pkg/content/file_test.go b/pkg/content/file_test.go index 14c50d05..781dc55f 100644 --- a/pkg/content/file_test.go +++ b/pkg/content/file_test.go @@ -22,9 +22,10 @@ import ( "testing" ctrcontent "github.com/containerd/containerd/content" - "github.com/oras-project/oras-go/pkg/content" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" + + "oras.land/oras-go/pkg/content" ) func TestFileStoreNoName(t *testing.T) { diff --git a/pkg/content/multireader_test.go b/pkg/content/multireader_test.go index 92ce1cfc..fc96440f 100644 --- a/pkg/content/multireader_test.go +++ b/pkg/content/multireader_test.go @@ -21,9 +21,10 @@ import ( "testing" ctrcontent "github.com/containerd/containerd/content" - "github.com/oras-project/oras-go/pkg/content" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" + + "oras.land/oras-go/pkg/content" ) var ( diff --git a/pkg/content/passthrough_test.go b/pkg/content/passthrough_test.go index 4b74d397..4ca949c4 100644 --- a/pkg/content/passthrough_test.go +++ b/pkg/content/passthrough_test.go @@ -24,9 +24,10 @@ import ( "testing" ctrcontent "github.com/containerd/containerd/content" - "github.com/oras-project/oras-go/pkg/content" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" + + "oras.land/oras-go/pkg/content" ) var ( diff --git a/pkg/oras/oras_test.go b/pkg/oras/oras_test.go index 2204d1c1..5186f0e2 100644 --- a/pkg/oras/oras_test.go +++ b/pkg/oras/oras_test.go @@ -29,7 +29,7 @@ import ( "testing" "time" - orascontent "github.com/oras-project/oras-go/pkg/content" + orascontent "oras.land/oras-go/pkg/content" "github.com/containerd/containerd/images" "github.com/containerd/containerd/remotes" diff --git a/pkg/oras/pull.go b/pkg/oras/pull.go index 8db0a345..8fe55091 100644 --- a/pkg/oras/pull.go +++ b/pkg/oras/pull.go @@ -19,8 +19,6 @@ import ( "context" "sync" - orascontent "github.com/oras-project/oras-go/pkg/content" - "github.com/containerd/containerd/content" "github.com/containerd/containerd/images" "github.com/containerd/containerd/log" @@ -28,6 +26,8 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" "golang.org/x/sync/semaphore" + + orascontent "oras.land/oras-go/pkg/content" ) // Pull pull files from the remote diff --git a/pkg/oras/pull_opts.go b/pkg/oras/pull_opts.go index 454e5889..907c27cf 100644 --- a/pkg/oras/pull_opts.go +++ b/pkg/oras/pull_opts.go @@ -21,12 +21,12 @@ import ( "io" "sync" - orascontent "github.com/oras-project/oras-go/pkg/content" - "github.com/containerd/containerd/images" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "golang.org/x/sync/semaphore" + + orascontent "oras.land/oras-go/pkg/content" ) type pullOpts struct { diff --git a/pkg/oras/push.go b/pkg/oras/push.go index 39e4a5c4..93542f5c 100644 --- a/pkg/oras/push.go +++ b/pkg/oras/push.go @@ -22,10 +22,11 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/images" "github.com/containerd/containerd/remotes" - artifact "github.com/oras-project/oras-go/pkg/artifact" digest "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go" ocispec "github.com/opencontainers/image-spec/specs-go/v1" + + artifact "oras.land/oras-go/pkg/artifact" ) // Push pushes files to the remote diff --git a/pkg/oras/push_opts.go b/pkg/oras/push_opts.go index 5d919c9e..1ae7b638 100644 --- a/pkg/oras/push_opts.go +++ b/pkg/oras/push_opts.go @@ -24,10 +24,10 @@ import ( "sync" "github.com/containerd/containerd/images" - orascontent "github.com/oras-project/oras-go/pkg/content" - ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" + + orascontent "oras.land/oras-go/pkg/content" ) type pushOpts struct { diff --git a/pkg/oras/store.go b/pkg/oras/store.go index d73f153f..33d87345 100644 --- a/pkg/oras/store.go +++ b/pkg/oras/store.go @@ -21,12 +21,12 @@ import ( "io" "time" - orascontent "github.com/oras-project/oras-go/pkg/content" - "github.com/containerd/containerd/content" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "golang.org/x/sync/errgroup" + + orascontent "oras.land/oras-go/pkg/content" ) // ensure interface