From fa6a26140480e9a838686d5289ec59a05affe876 Mon Sep 17 00:00:00 2001 From: Karsten Dambekalns Date: Fri, 27 Sep 2024 11:52:30 +0200 Subject: [PATCH] Support FLOW_CONTEXT override This needs a recent PHP container image, so if in doubt, start Local Beach with the `--pull` option if this doesn't work. --- assets/project/.localbeach.dist.env | 9 +++++++++ assets/project/.localbeach.docker-compose.yaml | 2 ++ 2 files changed, 11 insertions(+) diff --git a/assets/project/.localbeach.dist.env b/assets/project/.localbeach.dist.env index a40e11d..12f65e3 100644 --- a/assets/project/.localbeach.dist.env +++ b/assets/project/.localbeach.dist.env @@ -9,6 +9,15 @@ BEACH_VIRTUAL_HOSTS=${BEACH_PROJECT_NAME_LOWERCASE}.localbeach.net # Examples: 8.1 for PHP 8.1.x BEACH_PHP_IMAGE_VERSION=8.3 +# Change these if you need to adjust the Flow context +# BEACH_FLOW_BASE_CONTEXT=Production +# BEACH_FLOW_SUB_CONTEXT=Instance + +# if you need a custom Flow context instead of the default +# ${BEACH_FLOW_BASE_CONTEXT}/Beach/${BEACH_FLOW_SUB_CONTEXT} +# then you can override FLOW_CONTEXT with +# FLOW_CONTEXT=Development/Special + # Change these if your Flow setup is not in the project root BEACH_FLOW_ROOTPATH=${BEACH_FLOW_ROOTPATH} BEACH_APPLICATION_PATH=${BEACH_APPLICATION_PATH} diff --git a/assets/project/.localbeach.docker-compose.yaml b/assets/project/.localbeach.docker-compose.yaml index 89471de..b93476f 100644 --- a/assets/project/.localbeach.docker-compose.yaml +++ b/assets/project/.localbeach.docker-compose.yaml @@ -20,6 +20,7 @@ services: - BEACH_PHP_FPM_HOST=${BEACH_PROJECT_NAME:?Please specify a Beach project name as BEACH_PROJECT_NAME}_php - BEACH_FLOW_BASE_CONTEXT=${BEACH_FLOW_BASE_CONTEXT:-Development} - BEACH_FLOW_SUB_CONTEXT=${BEACH_FLOW_SUB_CONTEXT:-Instance} + - FLOW_CONTEXT=${FLOW_CONTEXT:-} - BEACH_PHP_MEMORY_LIMIT=${BEACH_PHP_MEMORY_LIMIT:-750M} - BEACH_PERSISTENT_RESOURCES_FALLBACK_BASE_URI=${BEACH_PERSISTENT_RESOURCES_FALLBACK_BASE_URI:-} - FLOW_HTTP_TRUSTED_PROXIES=* @@ -43,6 +44,7 @@ services: - BEACH_INSTANCE_NAME=${BEACH_PROJECT_NAME} - BEACH_FLOW_BASE_CONTEXT=${BEACH_FLOW_BASE_CONTEXT:-Development} - BEACH_FLOW_SUB_CONTEXT=${BEACH_FLOW_SUB_CONTEXT:-Instance} + - FLOW_CONTEXT=${FLOW_CONTEXT:-} - BEACH_DATABASE_HOST=${BEACH_DATABASE_HOST:-local_beach_database.local_beach} - BEACH_DATABASE_PORT=${BEACH_DATABASE_PORT:-3306} - BEACH_DATABASE_NAME=${BEACH_PROJECT_NAME}