diff --git a/go.mod b/go.mod index 98fed9c9..d6df130c 100644 --- a/go.mod +++ b/go.mod @@ -19,12 +19,12 @@ require ( github.com/awslabs/goformation/v4 v4.15.6 github.com/buger/goterm v1.0.0 github.com/cnabio/cnab-to-oci v0.3.1-beta1 - github.com/compose-spec/compose-go v0.0.0-20210901051814-965dc9caf5a0 + github.com/compose-spec/compose-go v0.0.0-20210901090333-feb401cda7f7 github.com/containerd/console v1.0.2 github.com/containerd/containerd v1.5.4 github.com/distribution/distribution/v3 v3.0.0-20210316161203-a01c71e2477e github.com/docker/cli v20.10.7+incompatible - github.com/docker/compose/v2 v2.0.0-00010101000000-000000000000 + github.com/docker/compose/v2 v2.0.0-20210902070652-5b30accf351f github.com/docker/docker v20.10.7+incompatible github.com/docker/go-connections v0.4.0 github.com/docker/go-units v0.4.0 @@ -75,5 +75,3 @@ require ( // (for buildx) replace github.com/jaguilar/vt100 => github.com/tonistiigi/vt100 v0.0.0-20190402012908-ad4c4a574305 - -replace github.com/docker/compose/v2 => github.com/docker/compose-cli/v2 v2.0.0-rc.2.0.20210831165642-09745fa0c3fe diff --git a/go.sum b/go.sum index ede7b8eb..f1f0f634 100644 --- a/go.sum +++ b/go.sum @@ -255,9 +255,8 @@ github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnht github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/codahale/hdrhistogram v0.0.0-20160425231609-f8ad88b59a58/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/compose-spec/compose-go v0.0.0-20210826124222-e6bb854d81e9/go.mod h1:Hnmn5ZCVA3sSBN2urjCZNNIyNqCPayRGH7PmMSaV2Q0= -github.com/compose-spec/compose-go v0.0.0-20210901051814-965dc9caf5a0 h1:CYg/mgji0LU7pG3jObjJmZWTiUa38txBJDUORoOw/e8= -github.com/compose-spec/compose-go v0.0.0-20210901051814-965dc9caf5a0/go.mod h1:Hnmn5ZCVA3sSBN2urjCZNNIyNqCPayRGH7PmMSaV2Q0= +github.com/compose-spec/compose-go v0.0.0-20210901090333-feb401cda7f7 h1:wI9VC+EgX61YYB/xyQVb9BBfsFOklZ/BinipIpFcWn4= +github.com/compose-spec/compose-go v0.0.0-20210901090333-feb401cda7f7/go.mod h1:Hnmn5ZCVA3sSBN2urjCZNNIyNqCPayRGH7PmMSaV2Q0= github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE= github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU= github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= @@ -413,9 +412,9 @@ github.com/docker/cli v20.10.5+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHv github.com/docker/cli v20.10.6+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v20.10.7+incompatible h1:pv/3NqibQKphWZiAskMzdz8w0PRbtTaEB+f6NwdU7Is= github.com/docker/cli v20.10.7+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/compose-cli/v2 v2.0.0-rc.2.0.20210831165642-09745fa0c3fe h1:udoy+K5rRZwGsHMPyMvOB4tyxHmIu6+tEObiFRZH9w8= -github.com/docker/compose-cli/v2 v2.0.0-rc.2.0.20210831165642-09745fa0c3fe/go.mod h1:uiQC3eBapoiY1u6a+8IFMyHdDRKeJRQVx5mD0/ozrGg= github.com/docker/compose-on-kubernetes v0.4.19-0.20190128150448-356b2919c496/go.mod h1:iT2pYfi580XlpaV4KmK0T6+4/9+XoKmk/fhoDod1emE= +github.com/docker/compose/v2 v2.0.0-20210902070652-5b30accf351f h1:YjG63wEdSZGdZYt/EOEclCQldN5Bg0jPNWDx//psKEw= +github.com/docker/compose/v2 v2.0.0-20210902070652-5b30accf351f/go.mod h1:9t3b24Terzo7Dx37p5Vtb7JEMPekAsnZUf5JmRblivg= github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= github.com/docker/distribution v2.6.0-rc.1.0.20180327202408-83389a148052+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.7.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=