From b83c3e239ed85a5862fee04fe0fe6c727e957879 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Mon, 6 Jan 2025 16:19:54 +0100 Subject: [PATCH] bake: update lookup order for override Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- bake/bake.go | 2 +- docs/bake-reference.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bake/bake.go b/bake/bake.go index 31383cf90205..49a1cf753f15 100644 --- a/bake/bake.go +++ b/bake/bake.go @@ -53,8 +53,8 @@ func defaultFilenames() []string { names = append(names, composecli.DefaultFileNames...) names = append(names, []string{ "docker-bake.json", - "docker-bake.override.json", "docker-bake.hcl", + "docker-bake.override.json", "docker-bake.override.hcl", }...) return names diff --git a/docs/bake-reference.md b/docs/bake-reference.md index 19483210a5be..192dded4fe60 100644 --- a/docs/bake-reference.md +++ b/docs/bake-reference.md @@ -19,8 +19,8 @@ By default, Bake uses the following lookup order to find the configuration file: 3. `docker-compose.yml` 4. `docker-compose.yaml` 5. `docker-bake.json` -6. `docker-bake.override.json` -7. `docker-bake.hcl` +6. `docker-bake.hcl` +7. `docker-bake.override.json` 8. `docker-bake.override.hcl` You can specify the file location explicitly using the `--file` flag: