From 5cb7ac0cc566ab17105ec2a0698e2038d90b6896 Mon Sep 17 00:00:00 2001 From: Silvin Lubecki Date: Tue, 24 Dec 2019 16:11:22 +0100 Subject: [PATCH] Move from deislabs/cnab-go to cnabio/cnab-go * Bump github.com/docker/cnab-to-oci v0.3.0-beta2 -> v0.3.0-beta3 * Bump github.com/cnabio/cnab-go v0.7.1-beta1 -> v0.8.0-beta1 Signed-off-by: Silvin Lubecki --- Gopkg.lock | 58 ++++++++++--------- Gopkg.toml | 6 +- cmd/cnab-run/bundle.go | 2 +- e2e/build_test.go | 2 +- e2e/commands_test.go | 2 +- e2e/main_test.go | 2 +- internal/bundle/parameters.go | 2 +- internal/bundle/parameters_test.go | 6 +- internal/cnab/driver.go | 6 +- internal/commands/build/build.go | 4 +- internal/commands/credentials.go | 4 +- internal/commands/credentials_test.go | 2 +- internal/commands/image/inspect.go | 2 +- internal/commands/image/list_test.go | 2 +- internal/commands/image/render.go | 4 +- internal/commands/inspect.go | 4 +- internal/commands/list.go | 2 +- internal/commands/list_test.go | 2 +- internal/commands/remove.go | 6 +- internal/commands/root.go | 2 +- internal/commands/run.go | 6 +- internal/commands/update.go | 6 +- internal/image/image.go | 2 +- internal/inspect/inspect.go | 4 +- internal/inspect/inspect_test.go | 4 +- internal/packager/bundle.go | 2 +- internal/packager/cnab.go | 4 +- internal/packager/custom.go | 2 +- internal/packager/custom_test.go | 2 +- internal/store/app.go | 2 +- internal/store/credential.go | 2 +- internal/store/credential_test.go | 2 +- internal/store/digest_test.go | 2 +- internal/store/image_test.go | 2 +- internal/store/installation.go | 4 +- internal/store/installation_test.go | 2 +- render/render.go | 2 +- render/render_test.go | 2 +- types/metadata/metadata.go | 2 +- .../{deislabs => cnabio}/cnab-go/LICENSE | 0 .../{deislabs => cnabio}/cnab-go/NOTICE | 0 .../cnab-go/action/action.go | 15 +++-- .../cnab-go/action/install.go | 6 +- .../cnab-go/action/operation_configs.go | 2 +- .../cnab-go/action/run_custom.go | 6 +- .../cnab-go/action/status.go | 6 +- .../cnab-go/action/uninstall.go | 6 +- .../cnab-go/action/upgrade.go | 6 +- .../cnab-go/bundle/bundle.go | 2 +- .../cnab-go/bundle/credentials.go | 0 .../cnab-go/bundle/definition/schema.go | 0 .../cnab-go/bundle/definition/validation.go | 0 .../cnab-go/bundle/definition/validators.go | 0 .../cnab-go/bundle/outputs.go | 0 .../cnab-go/bundle/parameters.go | 0 .../cnab-go/claim/claim.go | 2 +- .../cnab-go/claim/claimstore.go | 2 +- .../cnab-go/credentials/credentialset.go | 2 +- .../cnab-go/driver/docker/docker.go | 4 +- .../cnab-go/driver/driver.go | 2 +- .../cnab-go/utils/crud/filesystem.go | 0 .../cnab-go/utils/crud/mongodb.go | 0 .../cnab-go/utils/crud/store.go | 0 .../docker/cnab-to-oci/converter/convert.go | 2 +- .../docker/cnab-to-oci/converter/types.go | 2 +- .../docker/cnab-to-oci/remotes/fixup.go | 2 +- .../cnab-to-oci/remotes/fixuphelpers.go | 2 +- .../cnab-to-oci/remotes/fixupoptions.go | 8 +-- .../docker/cnab-to-oci/remotes/pull.go | 2 +- .../docker/cnab-to-oci/remotes/push.go | 19 +++--- 70 files changed, 136 insertions(+), 136 deletions(-) rename vendor/github.com/{deislabs => cnabio}/cnab-go/LICENSE (100%) rename vendor/github.com/{deislabs => cnabio}/cnab-go/NOTICE (100%) rename vendor/github.com/{deislabs => cnabio}/cnab-go/action/action.go (95%) rename vendor/github.com/{deislabs => cnabio}/cnab-go/action/install.go (89%) rename vendor/github.com/{deislabs => cnabio}/cnab-go/action/operation_configs.go (94%) rename vendor/github.com/{deislabs => cnabio}/cnab-go/action/run_custom.go (93%) rename vendor/github.com/{deislabs => cnabio}/cnab-go/action/status.go (85%) rename vendor/github.com/{deislabs => cnabio}/cnab-go/action/uninstall.go (87%) rename vendor/github.com/{deislabs => cnabio}/cnab-go/action/upgrade.go (87%) rename vendor/github.com/{deislabs => cnabio}/cnab-go/bundle/bundle.go (99%) rename vendor/github.com/{deislabs => cnabio}/cnab-go/bundle/credentials.go (100%) rename vendor/github.com/{deislabs => cnabio}/cnab-go/bundle/definition/schema.go (100%) rename vendor/github.com/{deislabs => cnabio}/cnab-go/bundle/definition/validation.go (100%) rename vendor/github.com/{deislabs => cnabio}/cnab-go/bundle/definition/validators.go (100%) rename vendor/github.com/{deislabs => cnabio}/cnab-go/bundle/outputs.go (100%) rename vendor/github.com/{deislabs => cnabio}/cnab-go/bundle/parameters.go (100%) rename vendor/github.com/{deislabs => cnabio}/cnab-go/claim/claim.go (98%) rename vendor/github.com/{deislabs => cnabio}/cnab-go/claim/claimstore.go (97%) rename vendor/github.com/{deislabs => cnabio}/cnab-go/credentials/credentialset.go (99%) rename vendor/github.com/{deislabs => cnabio}/cnab-go/driver/docker/docker.go (99%) rename vendor/github.com/{deislabs => cnabio}/cnab-go/driver/driver.go (98%) rename vendor/github.com/{deislabs => cnabio}/cnab-go/utils/crud/filesystem.go (100%) rename vendor/github.com/{deislabs => cnabio}/cnab-go/utils/crud/mongodb.go (100%) rename vendor/github.com/{deislabs => cnabio}/cnab-go/utils/crud/store.go (100%) diff --git a/Gopkg.lock b/Gopkg.lock index 62db1fba2..47b7a9cca 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -78,6 +78,23 @@ pruneopts = "NUT" revision = "3a771d992973f24aa725d07868b467d1ddfceafb" +[[projects]] + digest = "1:947b0f2d6d0f46da42f08f6ca1c74bd6cb0c66e517f71f6ec45ea3b10956aa3c" + name = "github.com/cnabio/cnab-go" + packages = [ + "action", + "bundle", + "bundle/definition", + "claim", + "credentials", + "driver", + "driver/docker", + "utils/crud", + ] + pruneopts = "NUT" + revision = "8b2ff3a6f40c837ae274552bc76b1e6499dc8beb" + version = "v0.8.0-beta1" + [[projects]] branch = "master" digest = "1:da4daad2ec1737eec4ebeeed7afedb631711f96bbac0c361a17a4d0369d00c6d" @@ -199,23 +216,6 @@ revision = "8991bc29aa16c548c550c7ff78260e27b9ab7c73" version = "v1.1.1" -[[projects]] - digest = "1:e7719c3f4db444af314e43231f9bff4c4c9bcbb327faffe186bf2e026473abd9" - name = "github.com/deislabs/cnab-go" - packages = [ - "action", - "bundle", - "bundle/definition", - "claim", - "credentials", - "driver", - "driver/docker", - "utils/crud", - ] - pruneopts = "NUT" - revision = "a1f17dcdaaff3e06c95ed85c3a34c21c35833831" - version = "v0.7.1-beta1" - [[projects]] digest = "1:fdf76ff539694e8aba8e9c60e7cc1dead88d21c9dc09e5a330104adad0887440" name = "github.com/docker/buildx" @@ -289,7 +289,7 @@ revision = "37f9a88c696ae81be14c1697bd083d6421b4933c" [[projects]] - digest = "1:0e9b90a528fee13963349cafa370f9709e7f1ef0df9eea53f31659aff2385336" + digest = "1:df6395cecd754ec152b433ebd39351bdf96375d9c9b5b4a34ccd4a197587991f" name = "github.com/docker/cnab-to-oci" packages = [ "converter", @@ -298,8 +298,8 @@ "remotes", ] pruneopts = "NUT" - revision = "aee9731b9e2d6066455e601f249835b10d5f87b7" - version = "v0.3.0-beta2" + revision = "bf0672a3966c7a41fb7ffb524231d79cb5e16f31" + version = "v0.3.0-beta3" [[projects]] digest = "1:d29e07dc6fff1d592442bdf6b947f3a89d418ac6d65344d4e048c64a7cdd511c" @@ -1414,16 +1414,16 @@ analyzer-name = "dep" analyzer-version = 1 input-imports = [ + "github.com/cnabio/cnab-go/action", + "github.com/cnabio/cnab-go/bundle", + "github.com/cnabio/cnab-go/bundle/definition", + "github.com/cnabio/cnab-go/claim", + "github.com/cnabio/cnab-go/credentials", + "github.com/cnabio/cnab-go/driver", + "github.com/cnabio/cnab-go/driver/docker", + "github.com/cnabio/cnab-go/utils/crud", "github.com/containerd/containerd/log", "github.com/containerd/containerd/platforms", - "github.com/deislabs/cnab-go/action", - "github.com/deislabs/cnab-go/bundle", - "github.com/deislabs/cnab-go/bundle/definition", - "github.com/deislabs/cnab-go/claim", - "github.com/deislabs/cnab-go/credentials", - "github.com/deislabs/cnab-go/driver", - "github.com/deislabs/cnab-go/driver/docker", - "github.com/deislabs/cnab-go/utils/crud", "github.com/docker/buildx/build", "github.com/docker/buildx/driver", "github.com/docker/buildx/driver/docker", @@ -1448,6 +1448,7 @@ "github.com/docker/cli/cli/context/kubernetes", "github.com/docker/cli/cli/context/store", "github.com/docker/cli/cli/flags", + "github.com/docker/cli/cli/streams", "github.com/docker/cli/opts", "github.com/docker/cli/templates", "github.com/docker/cnab-to-oci/relocation", @@ -1491,6 +1492,7 @@ "gotest.tools/icmd", "k8s.io/api/core/v1", "k8s.io/apimachinery/pkg/apis/meta/v1", + "k8s.io/apimachinery/pkg/util/wait", "k8s.io/client-go/kubernetes/typed/core/v1", ] solver-name = "gps-cdcl" diff --git a/Gopkg.toml b/Gopkg.toml index 335250d74..1cf28e7aa 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -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-beta3" [[override]] name = "github.com/containerd/containerd" @@ -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.0-beta1" [[constraint]] name = "github.com/sirupsen/logrus" diff --git a/cmd/cnab-run/bundle.go b/cmd/cnab-run/bundle.go index f14861f2b..4b58d8d9c 100644 --- a/cmd/cnab-run/bundle.go +++ b/cmd/cnab-run/bundle.go @@ -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" ) diff --git a/e2e/build_test.go b/e2e/build_test.go index 6aa71092b..13ec9ca5b 100644 --- a/e2e/build_test.go +++ b/e2e/build_test.go @@ -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" ) diff --git a/e2e/commands_test.go b/e2e/commands_test.go index 1f3d6e110..ee7be152a 100644 --- a/e2e/commands_test.go +++ b/e2e/commands_test.go @@ -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" diff --git a/e2e/main_test.go b/e2e/main_test.go index 6a8135159..d140662bf 100644 --- a/e2e/main_test.go +++ b/e2e/main_test.go @@ -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" diff --git a/internal/bundle/parameters.go b/internal/bundle/parameters.go index 17e58c718..1aa0da03e 100644 --- a/internal/bundle/parameters.go +++ b/internal/bundle/parameters.go @@ -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" diff --git a/internal/bundle/parameters_test.go b/internal/bundle/parameters_test.go index f77c318f7..b60c0502b 100644 --- a/internal/bundle/parameters_test.go +++ b/internal/bundle/parameters_test.go @@ -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" diff --git a/internal/cnab/driver.go b/internal/cnab/driver.go index 03954382c..46ec6c3de 100644 --- a/internal/cnab/driver.go +++ b/internal/cnab/driver.go @@ -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" diff --git a/internal/commands/build/build.go b/internal/commands/build/build.go index e41bfa6ca..a93de4eae 100644 --- a/internal/commands/build/build.go +++ b/internal/commands/build/build.go @@ -13,8 +13,8 @@ import ( "strings" "sync" - "github.com/deislabs/cnab-go/bundle" - cnab "github.com/deislabs/cnab-go/driver" + "github.com/cnabio/cnab-go/bundle" + cnab "github.com/cnabio/cnab-go/driver" "github.com/docker/app/internal" "github.com/docker/app/internal/packager" "github.com/docker/app/types" diff --git a/internal/commands/credentials.go b/internal/commands/credentials.go index 52112ebdc..b5cae09cd 100644 --- a/internal/commands/credentials.go +++ b/internal/commands/credentials.go @@ -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" diff --git a/internal/commands/credentials_test.go b/internal/commands/credentials_test.go index 30f970447..3a70a4ae3 100644 --- a/internal/commands/credentials_test.go +++ b/internal/commands/credentials_test.go @@ -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" diff --git a/internal/commands/image/inspect.go b/internal/commands/image/inspect.go index 8ef16ba84..d5951cb21 100644 --- a/internal/commands/image/inspect.go +++ b/internal/commands/image/inspect.go @@ -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" diff --git a/internal/commands/image/list_test.go b/internal/commands/image/list_test.go index 26f6ce7a6..653174ffc 100644 --- a/internal/commands/image/list_test.go +++ b/internal/commands/image/list_test.go @@ -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" diff --git a/internal/commands/image/render.go b/internal/commands/image/render.go index 50a7b06d6..35a3592fb 100644 --- a/internal/commands/image/render.go +++ b/internal/commands/image/render.go @@ -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" diff --git a/internal/commands/inspect.go b/internal/commands/inspect.go index b1177231b..5ea37eac9 100644 --- a/internal/commands/inspect.go +++ b/internal/commands/inspect.go @@ -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" diff --git a/internal/commands/list.go b/internal/commands/list.go index ed735343b..16a8f47c4 100644 --- a/internal/commands/list.go +++ b/internal/commands/list.go @@ -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" diff --git a/internal/commands/list_test.go b/internal/commands/list_test.go index 9159d75a0..f95b28158 100644 --- a/internal/commands/list_test.go +++ b/internal/commands/list_test.go @@ -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" ) diff --git a/internal/commands/remove.go b/internal/commands/remove.go index 21cd10317..5493764b8 100644 --- a/internal/commands/remove.go +++ b/internal/commands/remove.go @@ -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" diff --git a/internal/commands/root.go b/internal/commands/root.go index 4090b7bed..c8fd2bf42 100644 --- a/internal/commands/root.go +++ b/internal/commands/root.go @@ -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" diff --git a/internal/commands/run.go b/internal/commands/run.go index d3a268932..df863a19c 100644 --- a/internal/commands/run.go +++ b/internal/commands/run.go @@ -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" diff --git a/internal/commands/update.go b/internal/commands/update.go index dd2fbbbfb..ec586bf85 100644 --- a/internal/commands/update.go +++ b/internal/commands/update.go @@ -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" diff --git a/internal/image/image.go b/internal/image/image.go index 1f7115bdf..7a1532645 100644 --- a/internal/image/image.go +++ b/internal/image/image.go @@ -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" ) diff --git a/internal/inspect/inspect.go b/internal/inspect/inspect.go index 3216377c7..c0c75c46a 100644 --- a/internal/inspect/inspect.go +++ b/internal/inspect/inspect.go @@ -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" diff --git a/internal/inspect/inspect_test.go b/internal/inspect/inspect_test.go index 4ceb7c7af..001945b2a 100644 --- a/internal/inspect/inspect_test.go +++ b/internal/inspect/inspect_test.go @@ -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" diff --git a/internal/packager/bundle.go b/internal/packager/bundle.go index 1d911d5d7..47ac21146 100644 --- a/internal/packager/bundle.go +++ b/internal/packager/bundle.go @@ -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" diff --git a/internal/packager/cnab.go b/internal/packager/cnab.go index d6793156b..f94e86621 100644 --- a/internal/packager/cnab.go +++ b/internal/packager/cnab.go @@ -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" diff --git a/internal/packager/custom.go b/internal/packager/custom.go index 3264e2952..5f08bc3fd 100644 --- a/internal/packager/custom.go +++ b/internal/packager/custom.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/deislabs/cnab-go/bundle" + "github.com/cnabio/cnab-go/bundle" "github.com/docker/app/internal" ) diff --git a/internal/packager/custom_test.go b/internal/packager/custom_test.go index 1f8aa392f..a81acba6d 100644 --- a/internal/packager/custom_test.go +++ b/internal/packager/custom_test.go @@ -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" "gotest.tools/assert" ) diff --git a/internal/store/app.go b/internal/store/app.go index 32c584420..751444693 100644 --- a/internal/store/app.go +++ b/internal/store/app.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/deislabs/cnab-go/utils/crud" + "github.com/cnabio/cnab-go/utils/crud" digest "github.com/opencontainers/go-digest" "github.com/pkg/errors" ) diff --git a/internal/store/credential.go b/internal/store/credential.go index f059c04bd..3b9370e46 100644 --- a/internal/store/credential.go +++ b/internal/store/credential.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "path/filepath" - "github.com/deislabs/cnab-go/credentials" + "github.com/cnabio/cnab-go/credentials" "github.com/pkg/errors" ) diff --git a/internal/store/credential_test.go b/internal/store/credential_test.go index f2468cdd2..de63daf04 100644 --- a/internal/store/credential_test.go +++ b/internal/store/credential_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/deislabs/cnab-go/credentials" + "github.com/cnabio/cnab-go/credentials" "gotest.tools/assert" "gotest.tools/fs" ) diff --git a/internal/store/digest_test.go b/internal/store/digest_test.go index 455a9ff01..cc6c8a761 100644 --- a/internal/store/digest_test.go +++ b/internal/store/digest_test.go @@ -7,7 +7,7 @@ import ( "github.com/docker/app/internal/image" - "github.com/deislabs/cnab-go/bundle" + "github.com/cnabio/cnab-go/bundle" "gotest.tools/assert" "gotest.tools/fs" ) diff --git a/internal/store/image_test.go b/internal/store/image_test.go index 9b76e8a6d..ab022cff7 100644 --- a/internal/store/image_test.go +++ b/internal/store/image_test.go @@ -10,7 +10,7 @@ import ( "github.com/docker/app/internal/image" - "github.com/deislabs/cnab-go/bundle" + "github.com/cnabio/cnab-go/bundle" "github.com/docker/distribution/reference" "gotest.tools/assert" "gotest.tools/fs" diff --git a/internal/store/installation.go b/internal/store/installation.go index e1bcc110d..7a30a9482 100644 --- a/internal/store/installation.go +++ b/internal/store/installation.go @@ -8,8 +8,8 @@ import ( "github.com/docker/cnab-to-oci/relocation" - "github.com/deislabs/cnab-go/claim" - "github.com/deislabs/cnab-go/utils/crud" + "github.com/cnabio/cnab-go/claim" + "github.com/cnabio/cnab-go/utils/crud" ) // InstallationStore is an interface to persist, delete, list and read installations. diff --git a/internal/store/installation_test.go b/internal/store/installation_test.go index 6ff75cbb7..124be487f 100644 --- a/internal/store/installation_test.go +++ b/internal/store/installation_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/deislabs/cnab-go/claim" + "github.com/cnabio/cnab-go/claim" "gotest.tools/assert" "gotest.tools/fs" ) diff --git a/render/render.go b/render/render.go index 9ec84eec9..5723bbad1 100644 --- a/render/render.go +++ b/render/render.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "github.com/deislabs/cnab-go/bundle" + "github.com/cnabio/cnab-go/bundle" "github.com/docker/app/internal/compose" "github.com/docker/app/types" "github.com/docker/app/types/parameters" diff --git a/render/render_test.go b/render/render_test.go index 5d214883e..39149da65 100644 --- a/render/render_test.go +++ b/render/render_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/deislabs/cnab-go/bundle" + "github.com/cnabio/cnab-go/bundle" "github.com/docker/app/types" "github.com/docker/app/types/parameters" yaml "gopkg.in/yaml.v2" diff --git a/types/metadata/metadata.go b/types/metadata/metadata.go index 863491653..5f80b85bd 100644 --- a/types/metadata/metadata.go +++ b/types/metadata/metadata.go @@ -3,7 +3,7 @@ package metadata import ( "strings" - "github.com/deislabs/cnab-go/bundle" + "github.com/cnabio/cnab-go/bundle" ) // Maintainer represents one of the apps's maintainers diff --git a/vendor/github.com/deislabs/cnab-go/LICENSE b/vendor/github.com/cnabio/cnab-go/LICENSE similarity index 100% rename from vendor/github.com/deislabs/cnab-go/LICENSE rename to vendor/github.com/cnabio/cnab-go/LICENSE diff --git a/vendor/github.com/deislabs/cnab-go/NOTICE b/vendor/github.com/cnabio/cnab-go/NOTICE similarity index 100% rename from vendor/github.com/deislabs/cnab-go/NOTICE rename to vendor/github.com/cnabio/cnab-go/NOTICE diff --git a/vendor/github.com/deislabs/cnab-go/action/action.go b/vendor/github.com/cnabio/cnab-go/action/action.go similarity index 95% rename from vendor/github.com/deislabs/cnab-go/action/action.go rename to vendor/github.com/cnabio/cnab-go/action/action.go index 1fb919bb7..c19c3a8b7 100644 --- a/vendor/github.com/deislabs/cnab-go/action/action.go +++ b/vendor/github.com/cnabio/cnab-go/action/action.go @@ -7,11 +7,11 @@ import ( "math" "strings" - "github.com/deislabs/cnab-go/bundle" - "github.com/deislabs/cnab-go/bundle/definition" - "github.com/deislabs/cnab-go/claim" - "github.com/deislabs/cnab-go/credentials" - "github.com/deislabs/cnab-go/driver" + "github.com/cnabio/cnab-go/bundle" + "github.com/cnabio/cnab-go/bundle/definition" + "github.com/cnabio/cnab-go/claim" + "github.com/cnabio/cnab-go/credentials" + "github.com/cnabio/cnab-go/driver" ) // stateful is there just to make callers of opFromClaims more readable @@ -213,7 +213,10 @@ func opFromClaim(action string, stateless bool, c *claim.Claim, ii bundle.Invoca var outputs []string if c.Bundle.Outputs != nil { for _, v := range c.Bundle.Outputs { - outputs = append(outputs, v.Path) + // Only add to list if output applies to the provided action + if v.AppliesTo(action) { + outputs = append(outputs, v.Path) + } } } diff --git a/vendor/github.com/deislabs/cnab-go/action/install.go b/vendor/github.com/cnabio/cnab-go/action/install.go similarity index 89% rename from vendor/github.com/deislabs/cnab-go/action/install.go rename to vendor/github.com/cnabio/cnab-go/action/install.go index b89648a58..c5874a404 100644 --- a/vendor/github.com/deislabs/cnab-go/action/install.go +++ b/vendor/github.com/cnabio/cnab-go/action/install.go @@ -1,9 +1,9 @@ package action import ( - "github.com/deislabs/cnab-go/claim" - "github.com/deislabs/cnab-go/credentials" - "github.com/deislabs/cnab-go/driver" + "github.com/cnabio/cnab-go/claim" + "github.com/cnabio/cnab-go/credentials" + "github.com/cnabio/cnab-go/driver" ) // Install describes an installation action diff --git a/vendor/github.com/deislabs/cnab-go/action/operation_configs.go b/vendor/github.com/cnabio/cnab-go/action/operation_configs.go similarity index 94% rename from vendor/github.com/deislabs/cnab-go/action/operation_configs.go rename to vendor/github.com/cnabio/cnab-go/action/operation_configs.go index e4babcada..8a0f2f583 100644 --- a/vendor/github.com/deislabs/cnab-go/action/operation_configs.go +++ b/vendor/github.com/cnabio/cnab-go/action/operation_configs.go @@ -1,7 +1,7 @@ package action import ( - "github.com/deislabs/cnab-go/driver" + "github.com/cnabio/cnab-go/driver" ) // OperationConfigFunc is a configuration function that can be applied to an diff --git a/vendor/github.com/deislabs/cnab-go/action/run_custom.go b/vendor/github.com/cnabio/cnab-go/action/run_custom.go similarity index 93% rename from vendor/github.com/deislabs/cnab-go/action/run_custom.go rename to vendor/github.com/cnabio/cnab-go/action/run_custom.go index ccd554f46..861c7faac 100644 --- a/vendor/github.com/deislabs/cnab-go/action/run_custom.go +++ b/vendor/github.com/cnabio/cnab-go/action/run_custom.go @@ -3,9 +3,9 @@ package action import ( "errors" - "github.com/deislabs/cnab-go/claim" - "github.com/deislabs/cnab-go/credentials" - "github.com/deislabs/cnab-go/driver" + "github.com/cnabio/cnab-go/claim" + "github.com/cnabio/cnab-go/credentials" + "github.com/cnabio/cnab-go/driver" ) var ( diff --git a/vendor/github.com/deislabs/cnab-go/action/status.go b/vendor/github.com/cnabio/cnab-go/action/status.go similarity index 85% rename from vendor/github.com/deislabs/cnab-go/action/status.go rename to vendor/github.com/cnabio/cnab-go/action/status.go index d05829f33..4ffa1d198 100644 --- a/vendor/github.com/deislabs/cnab-go/action/status.go +++ b/vendor/github.com/cnabio/cnab-go/action/status.go @@ -1,9 +1,9 @@ package action import ( - "github.com/deislabs/cnab-go/claim" - "github.com/deislabs/cnab-go/credentials" - "github.com/deislabs/cnab-go/driver" + "github.com/cnabio/cnab-go/claim" + "github.com/cnabio/cnab-go/credentials" + "github.com/cnabio/cnab-go/driver" ) // Status runs a status action on a CNAB bundle. diff --git a/vendor/github.com/deislabs/cnab-go/action/uninstall.go b/vendor/github.com/cnabio/cnab-go/action/uninstall.go similarity index 87% rename from vendor/github.com/deislabs/cnab-go/action/uninstall.go rename to vendor/github.com/cnabio/cnab-go/action/uninstall.go index 4744b6234..fcc849275 100644 --- a/vendor/github.com/deislabs/cnab-go/action/uninstall.go +++ b/vendor/github.com/cnabio/cnab-go/action/uninstall.go @@ -1,9 +1,9 @@ package action import ( - "github.com/deislabs/cnab-go/claim" - "github.com/deislabs/cnab-go/credentials" - "github.com/deislabs/cnab-go/driver" + "github.com/cnabio/cnab-go/claim" + "github.com/cnabio/cnab-go/credentials" + "github.com/cnabio/cnab-go/driver" ) // Uninstall runs an uninstall action diff --git a/vendor/github.com/deislabs/cnab-go/action/upgrade.go b/vendor/github.com/cnabio/cnab-go/action/upgrade.go similarity index 87% rename from vendor/github.com/deislabs/cnab-go/action/upgrade.go rename to vendor/github.com/cnabio/cnab-go/action/upgrade.go index c04d88ca0..8892efdc3 100644 --- a/vendor/github.com/deislabs/cnab-go/action/upgrade.go +++ b/vendor/github.com/cnabio/cnab-go/action/upgrade.go @@ -1,9 +1,9 @@ package action import ( - "github.com/deislabs/cnab-go/claim" - "github.com/deislabs/cnab-go/credentials" - "github.com/deislabs/cnab-go/driver" + "github.com/cnabio/cnab-go/claim" + "github.com/cnabio/cnab-go/credentials" + "github.com/cnabio/cnab-go/driver" ) // Upgrade runs an upgrade action diff --git a/vendor/github.com/deislabs/cnab-go/bundle/bundle.go b/vendor/github.com/cnabio/cnab-go/bundle/bundle.go similarity index 99% rename from vendor/github.com/deislabs/cnab-go/bundle/bundle.go rename to vendor/github.com/cnabio/cnab-go/bundle/bundle.go index 043cab148..8e35e7c90 100644 --- a/vendor/github.com/deislabs/cnab-go/bundle/bundle.go +++ b/vendor/github.com/cnabio/cnab-go/bundle/bundle.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/Masterminds/semver" - "github.com/deislabs/cnab-go/bundle/definition" + "github.com/cnabio/cnab-go/bundle/definition" "github.com/docker/go/canonical/json" pkgErrors "github.com/pkg/errors" ) diff --git a/vendor/github.com/deislabs/cnab-go/bundle/credentials.go b/vendor/github.com/cnabio/cnab-go/bundle/credentials.go similarity index 100% rename from vendor/github.com/deislabs/cnab-go/bundle/credentials.go rename to vendor/github.com/cnabio/cnab-go/bundle/credentials.go diff --git a/vendor/github.com/deislabs/cnab-go/bundle/definition/schema.go b/vendor/github.com/cnabio/cnab-go/bundle/definition/schema.go similarity index 100% rename from vendor/github.com/deislabs/cnab-go/bundle/definition/schema.go rename to vendor/github.com/cnabio/cnab-go/bundle/definition/schema.go diff --git a/vendor/github.com/deislabs/cnab-go/bundle/definition/validation.go b/vendor/github.com/cnabio/cnab-go/bundle/definition/validation.go similarity index 100% rename from vendor/github.com/deislabs/cnab-go/bundle/definition/validation.go rename to vendor/github.com/cnabio/cnab-go/bundle/definition/validation.go diff --git a/vendor/github.com/deislabs/cnab-go/bundle/definition/validators.go b/vendor/github.com/cnabio/cnab-go/bundle/definition/validators.go similarity index 100% rename from vendor/github.com/deislabs/cnab-go/bundle/definition/validators.go rename to vendor/github.com/cnabio/cnab-go/bundle/definition/validators.go diff --git a/vendor/github.com/deislabs/cnab-go/bundle/outputs.go b/vendor/github.com/cnabio/cnab-go/bundle/outputs.go similarity index 100% rename from vendor/github.com/deislabs/cnab-go/bundle/outputs.go rename to vendor/github.com/cnabio/cnab-go/bundle/outputs.go diff --git a/vendor/github.com/deislabs/cnab-go/bundle/parameters.go b/vendor/github.com/cnabio/cnab-go/bundle/parameters.go similarity index 100% rename from vendor/github.com/deislabs/cnab-go/bundle/parameters.go rename to vendor/github.com/cnabio/cnab-go/bundle/parameters.go diff --git a/vendor/github.com/deislabs/cnab-go/claim/claim.go b/vendor/github.com/cnabio/cnab-go/claim/claim.go similarity index 98% rename from vendor/github.com/deislabs/cnab-go/claim/claim.go rename to vendor/github.com/cnabio/cnab-go/claim/claim.go index 95c832023..c4fb4f7e3 100644 --- a/vendor/github.com/deislabs/cnab-go/claim/claim.go +++ b/vendor/github.com/cnabio/cnab-go/claim/claim.go @@ -8,7 +8,7 @@ import ( "github.com/oklog/ulid" - "github.com/deislabs/cnab-go/bundle" + "github.com/cnabio/cnab-go/bundle" ) // Status constants define the CNAB status fields on a Result. diff --git a/vendor/github.com/deislabs/cnab-go/claim/claimstore.go b/vendor/github.com/cnabio/cnab-go/claim/claimstore.go similarity index 97% rename from vendor/github.com/deislabs/cnab-go/claim/claimstore.go rename to vendor/github.com/cnabio/cnab-go/claim/claimstore.go index 542d788c3..dc30a4db0 100644 --- a/vendor/github.com/deislabs/cnab-go/claim/claimstore.go +++ b/vendor/github.com/cnabio/cnab-go/claim/claimstore.go @@ -4,7 +4,7 @@ import ( "encoding/json" "errors" - "github.com/deislabs/cnab-go/utils/crud" + "github.com/cnabio/cnab-go/utils/crud" ) // ErrClaimNotFound represents a claim not found in claim storage diff --git a/vendor/github.com/deislabs/cnab-go/credentials/credentialset.go b/vendor/github.com/cnabio/cnab-go/credentials/credentialset.go similarity index 99% rename from vendor/github.com/deislabs/cnab-go/credentials/credentialset.go rename to vendor/github.com/cnabio/cnab-go/credentials/credentialset.go index ed4db8bd4..124848060 100644 --- a/vendor/github.com/deislabs/cnab-go/credentials/credentialset.go +++ b/vendor/github.com/cnabio/cnab-go/credentials/credentialset.go @@ -7,7 +7,7 @@ import ( "os/exec" "strings" - "github.com/deislabs/cnab-go/bundle" + "github.com/cnabio/cnab-go/bundle" yaml "gopkg.in/yaml.v2" ) diff --git a/vendor/github.com/deislabs/cnab-go/driver/docker/docker.go b/vendor/github.com/cnabio/cnab-go/driver/docker/docker.go similarity index 99% rename from vendor/github.com/deislabs/cnab-go/driver/docker/docker.go rename to vendor/github.com/cnabio/cnab-go/driver/docker/docker.go index 5d96830ca..4d11fc15b 100644 --- a/vendor/github.com/deislabs/cnab-go/driver/docker/docker.go +++ b/vendor/github.com/cnabio/cnab-go/driver/docker/docker.go @@ -9,7 +9,7 @@ import ( "os" unix_path "path" - "github.com/deislabs/cnab-go/driver" + "github.com/cnabio/cnab-go/driver" "github.com/docker/cli/cli/command" cliflags "github.com/docker/cli/cli/flags" "github.com/docker/distribution/reference" @@ -231,10 +231,10 @@ func (d *Driver) exec(op *driver.Operation) (driver.OperationResult, error) { } }() - statusc, errc := cli.Client().ContainerWait(ctx, resp.ID, container.WaitConditionNextExit) if err = cli.Client().ContainerStart(ctx, resp.ID, types.ContainerStartOptions{}); err != nil { return driver.OperationResult{}, fmt.Errorf("cannot start container: %v", err) } + statusc, errc := cli.Client().ContainerWait(ctx, resp.ID, container.WaitConditionNextExit) select { case err := <-errc: if err != nil { diff --git a/vendor/github.com/deislabs/cnab-go/driver/driver.go b/vendor/github.com/cnabio/cnab-go/driver/driver.go similarity index 98% rename from vendor/github.com/deislabs/cnab-go/driver/driver.go rename to vendor/github.com/cnabio/cnab-go/driver/driver.go index 7c93e2dfc..a709dfff9 100644 --- a/vendor/github.com/deislabs/cnab-go/driver/driver.go +++ b/vendor/github.com/cnabio/cnab-go/driver/driver.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "github.com/deislabs/cnab-go/bundle" + "github.com/cnabio/cnab-go/bundle" "github.com/docker/go/canonical/json" ) diff --git a/vendor/github.com/deislabs/cnab-go/utils/crud/filesystem.go b/vendor/github.com/cnabio/cnab-go/utils/crud/filesystem.go similarity index 100% rename from vendor/github.com/deislabs/cnab-go/utils/crud/filesystem.go rename to vendor/github.com/cnabio/cnab-go/utils/crud/filesystem.go diff --git a/vendor/github.com/deislabs/cnab-go/utils/crud/mongodb.go b/vendor/github.com/cnabio/cnab-go/utils/crud/mongodb.go similarity index 100% rename from vendor/github.com/deislabs/cnab-go/utils/crud/mongodb.go rename to vendor/github.com/cnabio/cnab-go/utils/crud/mongodb.go diff --git a/vendor/github.com/deislabs/cnab-go/utils/crud/store.go b/vendor/github.com/cnabio/cnab-go/utils/crud/store.go similarity index 100% rename from vendor/github.com/deislabs/cnab-go/utils/crud/store.go rename to vendor/github.com/cnabio/cnab-go/utils/crud/store.go diff --git a/vendor/github.com/docker/cnab-to-oci/converter/convert.go b/vendor/github.com/docker/cnab-to-oci/converter/convert.go index 41be73c42..928bebab2 100644 --- a/vendor/github.com/docker/cnab-to-oci/converter/convert.go +++ b/vendor/github.com/docker/cnab-to-oci/converter/convert.go @@ -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" diff --git a/vendor/github.com/docker/cnab-to-oci/converter/types.go b/vendor/github.com/docker/cnab-to-oci/converter/types.go index 177022123..1338359a6 100644 --- a/vendor/github.com/docker/cnab-to-oci/converter/types.go +++ b/vendor/github.com/docker/cnab-to-oci/converter/types.go @@ -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" diff --git a/vendor/github.com/docker/cnab-to-oci/remotes/fixup.go b/vendor/github.com/docker/cnab-to-oci/remotes/fixup.go index ac1f8ec20..909beaa72 100644 --- a/vendor/github.com/docker/cnab-to-oci/remotes/fixup.go +++ b/vendor/github.com/docker/cnab-to-oci/remotes/fixup.go @@ -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" diff --git a/vendor/github.com/docker/cnab-to-oci/remotes/fixuphelpers.go b/vendor/github.com/docker/cnab-to-oci/remotes/fixuphelpers.go index d198594e4..07244820f 100644 --- a/vendor/github.com/docker/cnab-to-oci/remotes/fixuphelpers.go +++ b/vendor/github.com/docker/cnab-to-oci/remotes/fixuphelpers.go @@ -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" diff --git a/vendor/github.com/docker/cnab-to-oci/remotes/fixupoptions.go b/vendor/github.com/docker/cnab-to-oci/remotes/fixupoptions.go index 9efc42acd..72f7fa8d1 100644 --- a/vendor/github.com/docker/cnab-to-oci/remotes/fixupoptions.go +++ b/vendor/github.com/docker/cnab-to-oci/remotes/fixupoptions.go @@ -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" ) diff --git a/vendor/github.com/docker/cnab-to-oci/remotes/pull.go b/vendor/github.com/docker/cnab-to-oci/remotes/pull.go index 882a63dba..b1b1ac1cb 100644 --- a/vendor/github.com/docker/cnab-to-oci/remotes/pull.go +++ b/vendor/github.com/docker/cnab-to-oci/remotes/pull.go @@ -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" diff --git a/vendor/github.com/docker/cnab-to-oci/remotes/push.go b/vendor/github.com/docker/cnab-to-oci/remotes/push.go index 189173e1e..14f2ca271 100644 --- a/vendor/github.com/docker/cnab-to-oci/remotes/push.go +++ b/vendor/github.com/docker/cnab-to-oci/remotes/push.go @@ -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"