From 8fed6d4d3116a8fbd03efd03a8c6b3b48007c0d4 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Wed, 10 Apr 2019 15:08:49 -0700 Subject: [PATCH] bake: rename compose file Signed-off-by: Tonis Tiigi --- commands/bake.go | 13 +++++++------ .../compose/{compose.yml => docker-compose.yml} | 0 2 files changed, 7 insertions(+), 6 deletions(-) rename hack/demo-env/examples/compose/{compose.yml => docker-compose.yml} (100%) diff --git a/commands/bake.go b/commands/bake.go index 54732655..666cbced 100644 --- a/commands/bake.go +++ b/commands/bake.go @@ -28,7 +28,7 @@ func runBake(dockerCli command.Cli, targets []string, in bakeOptions) error { return err } if len(files) == 0 { - return errors.Errorf("no compose.yml or dockerbuild.hcl found, speficy build file with -f/--file") + return errors.Errorf("no docker-compose.yml or dockerbuild.hcl found, specify build file with -f/--file") } in.files = files } @@ -61,11 +61,12 @@ func runBake(dockerCli command.Cli, targets []string, in bakeOptions) error { func defaultFiles() ([]string, error) { fns := []string{ - "compose.yml", // support app - "dockerbuild.json", - "dockerbuild-override.json", - "dockerbuild.hcl", - "dockerbuild-override.hcl", + "docker-compose.yml", // support app + "docker-compose.yaml", // support app + "docker-bake.json", + "docker-bake.override.json", + "docker-bake.hcl", + "docker-bake.override.hcl", } out := make([]string, 0, len(fns)) for _, f := range fns { diff --git a/hack/demo-env/examples/compose/compose.yml b/hack/demo-env/examples/compose/docker-compose.yml similarity index 100% rename from hack/demo-env/examples/compose/compose.yml rename to hack/demo-env/examples/compose/docker-compose.yml