From adb7bf67950567435a0ad906e2fe89291933f056 Mon Sep 17 00:00:00 2001 From: hygienic-books Date: Sun, 24 Dec 2023 02:56:03 +0100 Subject: [PATCH] fix(docker-compose): When we have only one service in Docker Compose set its Dockerfile context dir to just build-context/ instead of build-context/service since the latter doesn't exist --- docker-compose/examples/hashicorpvault/compose.override.yaml | 2 +- .../{{ cookiecutter.__project_slug }}/compose.override.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose/examples/hashicorpvault/compose.override.yaml b/docker-compose/examples/hashicorpvault/compose.override.yaml index c2d675e..3215ce5 100644 --- a/docker-compose/examples/hashicorpvault/compose.override.yaml +++ b/docker-compose/examples/hashicorpvault/compose.override.yaml @@ -4,7 +4,7 @@ services: image: "registry.example.com/project/vault:${VAULT_BUILD_DATE}-${VAULT_VERSION}" profiles: ["build"] build: - context: "build-context/vault" + context: "build-context" dockerfile: Dockerfile args: EXAMPLE_ARG_FOR_DOCKERFILE: "${EXAMPLE_ARG_FROM_ENV_FILE}" diff --git a/docker-compose/{{ cookiecutter.__project_slug }}/compose.override.yaml b/docker-compose/{{ cookiecutter.__project_slug }}/compose.override.yaml index 8775de0..4f47372 100644 --- a/docker-compose/{{ cookiecutter.__project_slug }}/compose.override.yaml +++ b/docker-compose/{{ cookiecutter.__project_slug }}/compose.override.yaml @@ -19,7 +19,7 @@ services: image: "{%- if cookiecutter.build == "yes" -%}registry.example.com/project/{%- endif -%}{{ cookiecutter.__component_list_slug }}:{%- if cookiecutter.build == "yes" -%}${% raw %}{{% endraw %}{{ cookiecutter.__component_list_slug.upper() }}_BUILD_DATE{% raw %}}{% endraw %}-{%- endif -%}${% raw %}{{% endraw %}{{ cookiecutter.__component_list_slug.upper() }}_VERSION{% raw %}}{% endraw %}" profiles: ["build"] build: - context: "build-context/{{ cookiecutter.__component_list_slug }}" + context: "build-context" dockerfile: Dockerfile args: EXAMPLE_ARG_FOR_DOCKERFILE: "${EXAMPLE_ARG_FROM_ENV_FILE}"