Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the cnabio fork of image-relocation #292

Merged
merged 1 commit into from
Aug 15, 2022
Merged

Use the cnabio fork of image-relocation #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ go 1.17

require (
github.com/Masterminds/semver v1.5.0
github.com/cnabio/image-relocation v0.0.0-20220815190842-cd2f11ecad88
github.com/cyberphone/json-canonicalization v0.0.0-20210303052042-6bc126869bf4
github.com/docker/cli v20.10.17+incompatible
github.com/docker/distribution v2.8.1+incompatible
Expand All @@ -13,7 +14,6 @@ require (
github.com/mitchellh/copystructure v1.0.0
github.com/oklog/ulid v1.3.1
github.com/opencontainers/go-digest v1.0.0
github.com/pivotal/image-relocation v0.0.0-20191111101224-e94aff6df06c
github.com/pkg/errors v0.9.1
github.com/qri-io/jsonpointer v0.1.1
github.com/qri-io/jsonschema v0.2.2-0.20210723092138-2eb22ee8115f
Expand Down Expand Up @@ -110,13 +110,11 @@ require (
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220314164441-57ef72a4c106 // indirect
google.golang.org/grpc v1.45.0 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/dancannon/gorethink.v3 v3.0.5 // indirect
Expand Down
40 changes: 4 additions & 36 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion imagestore/imagestoremocks/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package imagestoremocks

import "github.com/pivotal/image-relocation/pkg/image"
import "github.com/cnabio/image-relocation/pkg/image"

type MockStore struct {
AddStub func(im string) (string, error)
Expand Down
6 changes: 3 additions & 3 deletions imagestore/ocilayout/ocilayout.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"os"
"path/filepath"

"github.com/pivotal/image-relocation/pkg/image"
"github.com/pivotal/image-relocation/pkg/registry"
"github.com/pivotal/image-relocation/pkg/registry/ggcr"
"github.com/cnabio/image-relocation/pkg/image"
"github.com/cnabio/image-relocation/pkg/registry"
"github.com/cnabio/image-relocation/pkg/registry/ggcr"

"github.com/cnabio/cnab-go/imagestore"
)
Expand Down
2 changes: 1 addition & 1 deletion imagestore/ocilayout/ocilayout_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os/exec"
"testing"

"github.com/pivotal/image-relocation/pkg/image"
"github.com/cnabio/image-relocation/pkg/image"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

Expand Down
6 changes: 3 additions & 3 deletions imagestore/remote/remote.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package remote
import (
"fmt"

"github.com/pivotal/image-relocation/pkg/image"
"github.com/pivotal/image-relocation/pkg/registry"
"github.com/pivotal/image-relocation/pkg/registry/ggcr"
"github.com/cnabio/image-relocation/pkg/image"
"github.com/cnabio/image-relocation/pkg/registry"
"github.com/cnabio/image-relocation/pkg/registry/ggcr"

"github.com/cnabio/cnab-go/imagestore"
)
Expand Down
2 changes: 1 addition & 1 deletion imagestore/remote/remote_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os/exec"
"testing"

"github.com/pivotal/image-relocation/pkg/image"
"github.com/cnabio/image-relocation/pkg/image"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

Expand Down
4 changes: 2 additions & 2 deletions imagestore/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"io/ioutil"
"net/http"

"github.com/pivotal/image-relocation/pkg/image"
"github.com/pivotal/image-relocation/pkg/registry/ggcr"
"github.com/cnabio/image-relocation/pkg/image"
"github.com/cnabio/image-relocation/pkg/registry/ggcr"
)

// Store is an abstract image store.
Expand Down