Skip to content

Replace deislabs/duffle dependency with deislabs/cnab-go #32

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

Merged
simonferquel merged 2 commits into from
Apr 4, 2019
Merged

Replace deislabs/duffle dependency with deislabs/cnab-go #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6941204
Replace deislabs/duffle dependency with deislabs/cnab-go
Apr 2, 2019
04673ef
Update cnab-go to point to master
Apr 3, 2019
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
113 changes: 50 additions & 63 deletions Gopkg.lock
View file
Open in desktop

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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
version = "v1.0.1"

[[constraint]]
name = "github.com/deislabs/duffle"
name = "github.com/deislabs/cnab-go"
branch = "master"

[[constraint]]
Expand All @@ -40,7 +40,7 @@
[[override]]
name = "github.com/docker/cli"
revision = "f95ca8e1ba6c22c9abcdbf65e8dcc39c53958bba"

[[constraint]]
name = "github.com/docker/distribution"
revision = "83389a148052d74ac602f5f1d62f86ff2f3c4aa5"
Expand Down
2 changes: 1 addition & 1 deletion cmd/cnab-to-oci/fixup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"io/ioutil"
"os"

"github.com/deislabs/duffle/pkg/bundle"
"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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"fmt"
"io/ioutil"

"github.com/deislabs/duffle/pkg/bundle"
"github.com/deislabs/cnab-go/bundle"
"github.com/docker/cnab-to-oci/remotes"
"github.com/docker/distribution/reference"
"github.com/spf13/cobra"
Expand Down
2 changes: 1 addition & 1 deletion converter/convert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"fmt"

"github.com/containerd/containerd/images"
"github.com/deislabs/duffle/pkg/bundle"
"github.com/deislabs/cnab-go/bundle"
"github.com/docker/distribution/reference"
ocischema "github.com/opencontainers/image-spec/specs-go"
ocischemav1 "github.com/opencontainers/image-spec/specs-go/v1"
Expand Down
2 changes: 1 addition & 1 deletion converter/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package converter
import (
"encoding/json"

"github.com/deislabs/duffle/pkg/bundle"
"github.com/deislabs/cnab-go/bundle"
"github.com/docker/distribution"
"github.com/docker/distribution/manifest/schema2"
"github.com/opencontainers/go-digest"
Expand Down
2 changes: 1 addition & 1 deletion remotes/fixup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/containerd/containerd/images"
"github.com/containerd/containerd/remotes"
"github.com/deislabs/duffle/pkg/bundle"
"github.com/deislabs/cnab-go/bundle"
"github.com/docker/cli/cli/config/configfile"
"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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/containerd/containerd/images"
"github.com/containerd/containerd/remotes"
"github.com/deislabs/duffle/pkg/bundle"
"github.com/deislabs/cnab-go/bundle"
"github.com/docker/cli/opts"
"github.com/docker/cnab-to-oci/converter"
"github.com/docker/distribution/manifest/schema2"
Expand Down
2 changes: 1 addition & 1 deletion remotes/push.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/remotes"
"github.com/deislabs/duffle/pkg/bundle"
"github.com/deislabs/cnab-go/bundle"
"github.com/docker/cnab-to-oci/converter"
"github.com/docker/distribution/reference"
"github.com/opencontainers/go-digest"
Expand Down
2 changes: 1 addition & 1 deletion remotes/push_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"
"testing"

"github.com/deislabs/duffle/pkg/bundle"
"github.com/deislabs/cnab-go/bundle"
"github.com/docker/cnab-to-oci/converter"
"github.com/docker/cnab-to-oci/tests"
"github.com/docker/distribution/reference"
Expand Down
2 changes: 1 addition & 1 deletion tests/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package tests

import (
"github.com/deislabs/duffle/pkg/bundle"
"github.com/deislabs/cnab-go/bundle"
"github.com/docker/distribution/manifest/schema2"
ocischema "github.com/opencontainers/image-spec/specs-go"
ocischemav1 "github.com/opencontainers/image-spec/specs-go/v1"
Expand Down
0 vendor/github.com/deislabs/duffle/LICENSE → vendor/github.com/deislabs/cnab-go/LICENSE
View file
Open in desktop
File renamed without changes.
0 vendor/github.com/deislabs/duffle/NOTICE → vendor/github.com/deislabs/cnab-go/NOTICE
View file
Open in desktop
File renamed without changes.
0 ....com/deislabs/duffle/pkg/bundle/bundle.go → ...hub.com/deislabs/cnab-go/bundle/bundle.go
View file
Open in desktop
File renamed without changes.
0 .../deislabs/duffle/pkg/bundle/parameters.go → ...com/deislabs/cnab-go/bundle/parameters.go
View file
Open in desktop
File renamed without changes.
Empty file modified vendor/github.com/docker/cli/scripts/docs/generate-authors.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified vendor/github.com/docker/distribution/coverpkg.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified vendor/github.com/docker/docker/hack/generate-authors.sh
100644 → 100755
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions vendor/github.com/docker/docker/integration-cli/fixtures/https/ca.pem
View file
Open in desktop

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

1 change: 1 addition & 0 deletions vendor/github.com/docker/docker/integration-cli/fixtures/https/client-cert.pem
View file
Open in desktop

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

1 change: 1 addition & 0 deletions vendor/github.com/docker/docker/integration-cli/fixtures/https/client-key.pem
View file
Open in desktop

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

1 change: 1 addition & 0 deletions vendor/github.com/docker/docker/integration-cli/fixtures/https/server-cert.pem
View file
Open in desktop

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

Loading