Skip to content
This repository was archived by the owner on Nov 27, 2023. It is now read-only.

Commit 66da6be

Browse files
committed
support compose file set by COMPOSE_FILE env var
Signed-off-by: Nicolas De Loof <[email protected]>
1 parent 24e63e8 commit 66da6be

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

cli/cmd/compose/compose.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ func (o *projectOptions) toProjectOptions(po ...cli.ProjectOptionsFn) (*cli.Proj
145145
cli.WithDotEnv,
146146
cli.WithOsEnv,
147147
cli.WithWorkingDirectory(o.ProjectDir),
148+
cli.WithConfigFileEnv,
148149
cli.WithDefaultConfigPath,
149150
cli.WithName(o.ProjectName))...)
150151
}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ require (
1919
github.com/awslabs/goformation/v4 v4.15.6
2020
github.com/buger/goterm v1.0.0
2121
github.com/cnabio/cnab-to-oci v0.3.1-beta1
22-
github.com/compose-spec/compose-go v0.0.0-20210505145624-6dcd3d18b38b
22+
github.com/compose-spec/compose-go v0.0.0-20210520131822-b6b95cbdc5d7
2323
github.com/containerd/console v1.0.2
2424
github.com/containerd/containerd v1.5.0
2525
github.com/distribution/distribution/v3 v3.0.0-20210316161203-a01c71e2477e

go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,8 @@ github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnht
247247
github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
248248
github.com/codahale/hdrhistogram v0.0.0-20160425231609-f8ad88b59a58/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
249249
github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
250-
github.com/compose-spec/compose-go v0.0.0-20210505145624-6dcd3d18b38b h1:0MPA42m4n8VGsCld8hWmeRYeblPrgRDbiXPvRnjWoLY=
251-
github.com/compose-spec/compose-go v0.0.0-20210505145624-6dcd3d18b38b/go.mod h1:6eIT9U2OgdHmkRD6szmqatCrWWEEUSwl/j2iJYH4jLo=
250+
github.com/compose-spec/compose-go v0.0.0-20210520131822-b6b95cbdc5d7 h1:KfwhhvOK/1Ew4GN3S7D60Qva2hhR5SAD0jUq7tRGcwk=
251+
github.com/compose-spec/compose-go v0.0.0-20210520131822-b6b95cbdc5d7/go.mod h1:6eIT9U2OgdHmkRD6szmqatCrWWEEUSwl/j2iJYH4jLo=
252252
github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE=
253253
github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU=
254254
github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU=
@@ -989,6 +989,8 @@ github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi
989989
github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
990990
github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
991991
github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM=
992+
github.com/ndeloof/compose-go v0.0.0-20210517073401-04f18ce16d29 h1:dYh37/Nlke3oEik4JIdClG57ph/G5+5ScYl/oHJ1F3I=
993+
github.com/ndeloof/compose-go v0.0.0-20210517073401-04f18ce16d29/go.mod h1:6eIT9U2OgdHmkRD6szmqatCrWWEEUSwl/j2iJYH4jLo=
992994
github.com/ndeloof/helm/v3 v3.1.0-rc.1.0.20210507084602-d0ceda767d95 h1:pvtn6rEUjgm9DnEU9STpfgWwqqfq8zI4a0h1sHbKXdU=
993995
github.com/ndeloof/helm/v3 v3.1.0-rc.1.0.20210507084602-d0ceda767d95/go.mod h1:tB5XHR24t66QYXQIbS0jtaxF1neOCLbH99CiyKu1gwo=
994996
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=

0 commit comments

Comments
 (0)