Skip to content

Commit

Permalink
Merge pull request #85 from silvin-lubecki/cnabio-cnabgo
Browse files Browse the repository at this point in the history 
Move from deislabs/cnab-go to cnabio/cnab-go
  • Loading branch information
@silvin-lubecki
silvin-lubecki committed Dec 27, 2019
2 parents aee9731 + ed70e38 commit bf0672a
Show file tree
Hide file tree
Showing 24 changed files with 39 additions and 44 deletions.
26 changes: 13 additions & 13 deletions Gopkg.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Gopkg.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
version = "v1.0.1"

[[constraint]]
name = "github.com/deislabs/cnab-go"
version = "v0.7.1-beta1"
name = "github.com/cnabio/cnab-go"
version = "v0.8.0-beta1"

[[constraint]]
name = "github.com/containerd/containerd"
Expand Down
2 changes: 1 addition & 1 deletion cmd/cnab-to-oci/fixup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"io/ioutil"
"os"

"github.com/cnabio/cnab-go/bundle"
containerdRemotes "github.com/containerd/containerd/remotes"
"github.com/deislabs/cnab-go/bundle"
"github.com/docker/cli/cli/config"
"github.com/docker/cnab-to-oci/remotes"
"github.com/docker/distribution/reference"
Expand Down
2 changes: 1 addition & 1 deletion cmd/cnab-to-oci/push.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"io/ioutil"
"os"

"github.com/deislabs/cnab-go/bundle"
"github.com/cnabio/cnab-go/bundle"
"github.com/docker/cnab-to-oci/remotes"
"github.com/docker/distribution/reference"
"github.com/docker/docker/client"
Expand Down
2 changes: 1 addition & 1 deletion converter/convert.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"fmt"
"sort"

"github.com/cnabio/cnab-go/bundle"
"github.com/containerd/containerd/images"
"github.com/deislabs/cnab-go/bundle"
"github.com/docker/cnab-to-oci/relocation"
"github.com/docker/distribution/reference"
ocischema "github.com/opencontainers/image-spec/specs-go"
Expand Down
2 changes: 1 addition & 1 deletion converter/types.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package converter

import (
"github.com/deislabs/cnab-go/bundle"
"github.com/cnabio/cnab-go/bundle"
"github.com/docker/distribution"
"github.com/docker/distribution/manifest/schema2"
"github.com/docker/go/canonical/json"
Expand Down
2 changes: 1 addition & 1 deletion converter/types_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package converter
import (
"testing"

"github.com/deislabs/cnab-go/bundle"
"github.com/cnabio/cnab-go/bundle"
"gotest.tools/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion remotes/fixup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"fmt"
"io/ioutil"

"github.com/cnabio/cnab-go/bundle"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/remotes"
"github.com/deislabs/cnab-go/bundle"
"github.com/docker/cnab-to-oci/relocation"
"github.com/docker/distribution/reference"
ocischemav1 "github.com/opencontainers/image-spec/specs-go/v1"
Expand Down
2 changes: 1 addition & 1 deletion remotes/fixup_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"os"
"testing"

"github.com/cnabio/cnab-go/bundle"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/platforms"
"github.com/deislabs/cnab-go/bundle"
"github.com/docker/cnab-to-oci/relocation"
"github.com/docker/distribution/reference"
"github.com/opencontainers/go-digest"
Expand Down
2 changes: 1 addition & 1 deletion remotes/fixuphelpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"io"
"io/ioutil"

"github.com/cnabio/cnab-go/bundle"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/remotes"
"github.com/deislabs/cnab-go/bundle"
"github.com/docker/distribution/reference"
"github.com/opencontainers/go-digest"
ocischemav1 "github.com/opencontainers/image-spec/specs-go/v1"
Expand Down
8 changes: 3 additions & 5 deletions remotes/fixupoptions.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,11 @@ import (
"io"
"io/ioutil"

"github.com/docker/cnab-to-oci/relocation"

"github.com/docker/cnab-to-oci/internal"

"github.com/cnabio/cnab-go/bundle"
"github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/remotes"
"github.com/deislabs/cnab-go/bundle"
"github.com/docker/cnab-to-oci/internal"
"github.com/docker/cnab-to-oci/relocation"
"github.com/docker/distribution/reference"
ocischemav1 "github.com/opencontainers/image-spec/specs-go/v1"
)
Expand Down
2 changes: 1 addition & 1 deletion remotes/pull.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"fmt"
"io/ioutil"

"github.com/cnabio/cnab-go/bundle"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/remotes"
"github.com/deislabs/cnab-go/bundle"
"github.com/docker/cli/opts"
"github.com/docker/cnab-to-oci/converter"
"github.com/docker/cnab-to-oci/relocation"
Expand Down
19 changes: 8 additions & 11 deletions remotes/push.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,22 @@ import (
"io"
"os"

"github.com/docker/cli/cli/config/credentials"

"github.com/docker/cnab-to-oci/internal"

"github.com/docker/cli/cli/config"
configtypes "github.com/docker/cli/cli/config/types"
"github.com/docker/docker/api/types"
"github.com/docker/docker/pkg/jsonmessage"
"github.com/docker/docker/registry"

"github.com/cnabio/cnab-go/bundle"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/remotes"
"github.com/deislabs/cnab-go/bundle"
"github.com/docker/cli/cli/config"
"github.com/docker/cli/cli/config/credentials"
configtypes "github.com/docker/cli/cli/config/types"
"github.com/docker/cnab-to-oci/converter"
"github.com/docker/cnab-to-oci/internal"
"github.com/docker/cnab-to-oci/relocation"
"github.com/docker/distribution/reference"
"github.com/docker/docker/api/types"
registrytypes "github.com/docker/docker/api/types/registry"
"github.com/docker/docker/pkg/jsonmessage"
"github.com/docker/docker/registry"
"github.com/opencontainers/go-digest"
ocischemav1 "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors"
Expand Down
2 changes: 1 addition & 1 deletion remotes/push_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"
"testing"

"github.com/deislabs/cnab-go/bundle"
"github.com/cnabio/cnab-go/bundle"
"github.com/docker/cnab-to-oci/converter"
"github.com/docker/cnab-to-oci/tests"
"github.com/docker/distribution/reference"
Expand Down
4 changes: 2 additions & 2 deletions tests/helpers.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package tests

import (
"github.com/deislabs/cnab-go/bundle"
"github.com/deislabs/cnab-go/bundle/definition"
"github.com/cnabio/cnab-go/bundle"
"github.com/cnabio/cnab-go/bundle/definition"
"github.com/docker/cnab-to-oci/relocation"
"github.com/docker/distribution/manifest/schema2"
ocischema "github.com/opencontainers/image-spec/specs-go"
Expand Down
0 vendor/github.com/deislabs/cnab-go/LICENSE → vendor/github.com/cnabio/cnab-go/LICENSE
View file
File renamed without changes.
0 vendor/github.com/deislabs/cnab-go/NOTICE → vendor/github.com/cnabio/cnab-go/NOTICE
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...hub.com/deislabs/cnab-go/bundle/bundle.go → ...ithub.com/cnabio/cnab-go/bundle/bundle.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...om/deislabs/cnab-go/bundle/credentials.go → ....com/cnabio/cnab-go/bundle/credentials.go
View file
File renamed without changes.
0 ...slabs/cnab-go/bundle/definition/schema.go → ...nabio/cnab-go/bundle/definition/schema.go
View file
File renamed without changes.
0 ...s/cnab-go/bundle/definition/validation.go → ...o/cnab-go/bundle/definition/validation.go
View file
File renamed without changes.
0 ...s/cnab-go/bundle/definition/validators.go → ...o/cnab-go/bundle/definition/validators.go
View file
File renamed without changes.
0 ...ub.com/deislabs/cnab-go/bundle/outputs.go → ...thub.com/cnabio/cnab-go/bundle/outputs.go
View file
File renamed without changes.
0 ...com/deislabs/cnab-go/bundle/parameters.go → ...b.com/cnabio/cnab-go/bundle/parameters.go
View file
File renamed without changes.

0 comments on commit bf0672a

Please sign in to comment.