Skip to content
This repository has been archived by the owner on Jun 13, 2021. It is now read-only.

Move from deislabs/cnab-go to cnabio/cnab-go #788

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
56 changes: 28 additions & 28 deletions Gopkg.lock

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

6 changes: 3 additions & 3 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ required = ["github.com/wadey/gocovmerge"]

[[override]]
name = "github.com/docker/cnab-to-oci"
version = "v0.3.0-beta2"
version = "v0.3.0-beta4"

[[override]]
name = "github.com/containerd/containerd"
Expand All @@ -53,8 +53,8 @@ required = ["github.com/wadey/gocovmerge"]
revision = "37f9a88c696ae81be14c1697bd083d6421b4933c"

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

[[constraint]]
name = "github.com/sirupsen/logrus"
Expand Down
2 changes: 1 addition & 1 deletion cmd/cnab-run/bundle.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"github.com/deislabs/cnab-go/bundle"
"github.com/cnabio/cnab-go/bundle"
"github.com/docker/app/internal/image"
"github.com/docker/cnab-to-oci/relocation"
)
Expand Down
2 changes: 1 addition & 1 deletion e2e/build_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (

"github.com/docker/app/internal/store"

"github.com/deislabs/cnab-go/bundle"
"github.com/cnabio/cnab-go/bundle"
"gotest.tools/assert"
"gotest.tools/icmd"
)
Expand Down
2 changes: 1 addition & 1 deletion e2e/commands_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"strings"
"testing"

"github.com/deislabs/cnab-go/credentials"
"github.com/cnabio/cnab-go/credentials"
"github.com/docker/app/internal"
"github.com/docker/app/internal/image"
"github.com/docker/app/internal/yaml"
Expand Down
2 changes: 1 addition & 1 deletion e2e/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"runtime"
"testing"

"github.com/deislabs/cnab-go/credentials"
"github.com/cnabio/cnab-go/credentials"
"github.com/docker/app/internal/store"
dockerConfigFile "github.com/docker/cli/cli/config/configfile"
"gotest.tools/assert"
Expand Down
2 changes: 1 addition & 1 deletion internal/bundle/parameters.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"os"
"strings"

"github.com/deislabs/cnab-go/bundle"
"github.com/cnabio/cnab-go/bundle"
"github.com/docker/app/internal"
"github.com/docker/app/internal/packager"
"github.com/docker/app/internal/store"
Expand Down
6 changes: 3 additions & 3 deletions internal/bundle/parameters_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (

"github.com/docker/app/internal/image"

"github.com/deislabs/cnab-go/bundle"
"github.com/deislabs/cnab-go/bundle/definition"
"github.com/deislabs/cnab-go/claim"
"github.com/cnabio/cnab-go/bundle"
"github.com/cnabio/cnab-go/bundle/definition"
"github.com/cnabio/cnab-go/claim"
"github.com/docker/app/internal"
"github.com/docker/app/internal/packager"
"github.com/docker/app/internal/store"
Expand Down
6 changes: 3 additions & 3 deletions internal/cnab/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"github.com/docker/app/internal/cliopts"
"github.com/docker/app/internal/store"

"github.com/deislabs/cnab-go/claim"
"github.com/deislabs/cnab-go/driver"
dockerDriver "github.com/deislabs/cnab-go/driver/docker"
"github.com/cnabio/cnab-go/claim"
"github.com/cnabio/cnab-go/driver"
dockerDriver "github.com/cnabio/cnab-go/driver/docker"
"github.com/docker/app/internal"
"github.com/docker/cli/cli/command"
"github.com/docker/cli/cli/context/docker"
Expand Down
7 changes: 3 additions & 4 deletions internal/commands/build/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,12 @@ import (
"strings"
"sync"

"github.com/cnabio/cnab-go/bundle"
cnab "github.com/cnabio/cnab-go/driver"
"github.com/containerd/console"
"github.com/docker/app/internal"
"github.com/docker/app/internal/packager"
"github.com/docker/app/types"

"github.com/containerd/console"
"github.com/deislabs/cnab-go/bundle"
cnab "github.com/deislabs/cnab-go/driver"
"github.com/docker/buildx/build"
"github.com/docker/buildx/driver"
_ "github.com/docker/buildx/driver/docker" // required to get default driver registered, see driver/docker/factory.go:14
Expand Down
4 changes: 2 additions & 2 deletions internal/commands/credentials.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"os"
"strings"

"github.com/deislabs/cnab-go/bundle"
"github.com/deislabs/cnab-go/credentials"
"github.com/cnabio/cnab-go/bundle"
"github.com/cnabio/cnab-go/credentials"
"github.com/docker/app/internal"
appstore "github.com/docker/app/internal/store"
"github.com/docker/cli/cli/command"
Expand Down
2 changes: 1 addition & 1 deletion internal/commands/credentials_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"
"testing"

"github.com/deislabs/cnab-go/bundle"
"github.com/cnabio/cnab-go/bundle"
"github.com/docker/app/internal"
"github.com/docker/cli/cli/command"
"github.com/docker/cli/cli/config/configfile"
Expand Down
2 changes: 1 addition & 1 deletion internal/commands/image/inspect.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/docker/app/internal/packager"

"github.com/deislabs/cnab-go/action"
"github.com/cnabio/cnab-go/action"
"github.com/docker/app/internal"
"github.com/docker/app/internal/cliopts"
"github.com/docker/app/internal/cnab"
Expand Down
2 changes: 1 addition & 1 deletion internal/commands/image/list_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"gotest.tools/assert"

"github.com/deislabs/cnab-go/bundle"
"github.com/cnabio/cnab-go/bundle"
"github.com/docker/app/internal/store"
"github.com/docker/cli/cli/command"
"github.com/docker/distribution/reference"
Expand Down
4 changes: 2 additions & 2 deletions internal/commands/image/render.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"io"
"os"

"github.com/deislabs/cnab-go/action"
"github.com/deislabs/cnab-go/driver"
"github.com/cnabio/cnab-go/action"
"github.com/cnabio/cnab-go/driver"
"github.com/docker/app/internal"
bdl "github.com/docker/app/internal/bundle"
"github.com/docker/app/internal/cliopts"
Expand Down
4 changes: 2 additions & 2 deletions internal/commands/inspect.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"fmt"
"os"

"github.com/deislabs/cnab-go/action"
"github.com/deislabs/cnab-go/bundle"
"github.com/cnabio/cnab-go/action"
"github.com/cnabio/cnab-go/bundle"
"github.com/docker/app/internal"
"github.com/docker/app/internal/cliopts"
"github.com/docker/app/internal/cnab"
Expand Down
2 changes: 1 addition & 1 deletion internal/commands/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"text/tabwriter"
"time"

"github.com/deislabs/cnab-go/action"
"github.com/cnabio/cnab-go/action"
"github.com/docker/app/internal"
"github.com/docker/app/internal/cliopts"
"github.com/docker/app/internal/cnab"
Expand Down
2 changes: 1 addition & 1 deletion internal/commands/list_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"
"time"

"github.com/deislabs/cnab-go/claim"
"github.com/cnabio/cnab-go/claim"
"github.com/docker/app/internal/store"
"gotest.tools/assert"
)
Expand Down
6 changes: 3 additions & 3 deletions internal/commands/remove.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"github.com/docker/app/internal/packager"
"github.com/docker/app/internal/store"

"github.com/deislabs/cnab-go/driver"
"github.com/cnabio/cnab-go/driver"

"github.com/deislabs/cnab-go/action"
"github.com/deislabs/cnab-go/credentials"
"github.com/cnabio/cnab-go/action"
"github.com/cnabio/cnab-go/credentials"
"github.com/docker/cli/cli"
"github.com/docker/cli/cli/command"
multierror "github.com/hashicorp/go-multierror"
Expand Down
2 changes: 1 addition & 1 deletion internal/commands/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"io/ioutil"
"os"

"github.com/deislabs/cnab-go/claim"
"github.com/cnabio/cnab-go/claim"
"github.com/docker/app/internal"
"github.com/docker/app/internal/cliopts"
"github.com/docker/app/internal/commands/build"
Expand Down
6 changes: 3 additions & 3 deletions internal/commands/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (

"github.com/docker/app/internal/image"

"github.com/deislabs/cnab-go/driver"
"github.com/cnabio/cnab-go/driver"
"github.com/docker/app/internal/cliopts"

"github.com/deislabs/cnab-go/action"
"github.com/deislabs/cnab-go/credentials"
"github.com/cnabio/cnab-go/action"
"github.com/cnabio/cnab-go/credentials"
bdl "github.com/docker/app/internal/bundle"
"github.com/docker/app/internal/cnab"
"github.com/docker/app/internal/store"
Expand Down
6 changes: 3 additions & 3 deletions internal/commands/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"fmt"
"os"

"github.com/deislabs/cnab-go/driver"
"github.com/cnabio/cnab-go/driver"

"github.com/deislabs/cnab-go/action"
"github.com/deislabs/cnab-go/credentials"
"github.com/cnabio/cnab-go/action"
"github.com/cnabio/cnab-go/credentials"
"github.com/docker/app/internal/bundle"
"github.com/docker/app/internal/cliopts"
"github.com/docker/app/internal/cnab"
Expand Down
2 changes: 1 addition & 1 deletion internal/image/image.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/pkg/errors"

"github.com/deislabs/cnab-go/bundle"
"github.com/cnabio/cnab-go/bundle"
"github.com/docker/cnab-to-oci/relocation"
"github.com/docker/go/canonical/json"
)
Expand Down
4 changes: 2 additions & 2 deletions internal/inspect/inspect.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"github.com/docker/app/types/metadata"
"github.com/docker/app/types/parameters"

"github.com/deislabs/cnab-go/bundle"
"github.com/deislabs/cnab-go/claim"
"github.com/cnabio/cnab-go/bundle"
"github.com/cnabio/cnab-go/claim"
composetypes "github.com/docker/cli/cli/compose/types"
"github.com/docker/go-units"
humanize "github.com/dustin/go-humanize"
Expand Down
4 changes: 2 additions & 2 deletions internal/inspect/inspect_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"testing"
"time"

"github.com/deislabs/cnab-go/bundle"
"github.com/deislabs/cnab-go/claim"
"github.com/cnabio/cnab-go/bundle"
"github.com/cnabio/cnab-go/claim"
"github.com/docker/app/internal"
"github.com/docker/app/internal/store"
"github.com/docker/app/types"
Expand Down
2 changes: 1 addition & 1 deletion internal/packager/bundle.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/docker/app/internal/image"

"github.com/deislabs/cnab-go/bundle"
"github.com/cnabio/cnab-go/bundle"
"github.com/docker/app/internal/store"
"github.com/docker/app/types"
"github.com/docker/app/types/metadata"
Expand Down
4 changes: 2 additions & 2 deletions internal/packager/cnab.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package packager
import (
"encoding/json"

"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/app/internal"
"github.com/docker/app/internal/compose"
"github.com/docker/app/types"
Expand Down
2 changes: 1 addition & 1 deletion internal/packager/custom.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"io"

"github.com/deislabs/cnab-go/bundle"
"github.com/cnabio/cnab-go/bundle"
"github.com/docker/app/internal"
)

Expand Down
Loading