From 7fe947debce0eca033edf565d8491d7e87f5ae4e Mon Sep 17 00:00:00 2001 From: andytson-inviqa Date: Mon, 9 Jun 2025 15:18:35 +0100 Subject: [PATCH 1/2] feat: port docker harness console build args to override --- src/_base/_twig/docker-compose.yml/service/console.yml.twig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/_base/_twig/docker-compose.yml/service/console.yml.twig b/src/_base/_twig/docker-compose.yml/service/console.yml.twig index 17d66af5f..5cfabdf0f 100644 --- a/src/_base/_twig/docker-compose.yml/service/console.yml.twig +++ b/src/_base/_twig/docker-compose.yml/service/console.yml.twig @@ -7,6 +7,7 @@ services: build: context: ./ dockerfile: .my127ws/docker/image/console/Dockerfile + args: {{ to_nice_yaml(@('services.console.build.args')|default({}), 2, 8) }} {% if @('app.build') == 'dynamic' %} entrypoint: [/entrypoint.dynamic.sh] command: [sleep, infinity] @@ -22,6 +23,7 @@ services: # deprecated, a later workspace release will disable by default - traefik.enable=false environment: {{ to_nice_yaml(deep_merge([ + @('app.build') == 'dynamic' ? @('services.console.build.args')|default({}) : [], @('services.php-base.environment'), @('services.php-base.environment_dynamic'), @('services.console.environment'), From 48a24ff4fbe4ae2cbd6cea83486e4b491f5aa126 Mon Sep 17 00:00:00 2001 From: andytson-inviqa Date: Mon, 9 Jun 2025 15:26:12 +0100 Subject: [PATCH 2/2] fix: include console build arg names in Dockerfile --- src/_base/docker/image/console/Dockerfile.twig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/_base/docker/image/console/Dockerfile.twig b/src/_base/docker/image/console/Dockerfile.twig index 3ba47d102..7bcfa9ff1 100644 --- a/src/_base/docker/image/console/Dockerfile.twig +++ b/src/_base/docker/image/console/Dockerfile.twig @@ -34,6 +34,13 @@ RUN apt-get update -qq \ && rm -rf /var/lib/apt/lists/* {% endif %} +{% set build_args=@('services.console.build.args')|default({})|filter(v => v is not empty) %} +{% if build_args %} +{% for name, value in build_args %} +ARG {{ name }} +{% endfor %} +{% endif %} + ENV APP_MODE={{ @('app.mode') }} \ APP_BUILD={{ @('app.build') }} \ ASSETS_DIR={{ @('assets.local') }}