Skip to content

Commit 6f26923

Browse files
committed
Allow to override FLOW_CONTEXT with custom value
1 parent 42982e6 commit 6f26923

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ similar mechanism in Kubernetes or your actual platform.
5353
| BEACH_APPLICATION_CUSTOM_STARTUP_SCRIPTS_ENABLE | boolean | true | If custom startup scripts (beach-startup.sh) should be run |
5454
| BEACH_FLOW_BASE_CONTEXT | string | Production | Base context, either "Development" or "Production" |
5555
| BEACH_FLOW_SUB_CONTEXT | string | Instance | Sub context |
56-
| BEACH_FLOW_CONTEXT | string | Production/Beach/Instance | (read-only) The actual Flow context; pattern: "{…BASE_CONTEXT}/Beach/{…SUB_CONTEXT}" |
56+
| BEACH_FLOW_CONTEXT | string | Production/Beach/Instance | (read-only) The built Flow context; pattern: "{…BASE_CONTEXT}/Beach/{…SUB_CONTEXT}" |
57+
| FLOW_CONTEXT | string | | The actual Flow context; default is BEACH_FLOW_CONTEXT |
5758
| BEACH_ENVIRONMENT_VARIABLES_ALLOW_LIST | string | | If set, only these environment variables are promoted to the "beach" user's shell |
5859
| BEACH_CRON_ENABLE | boolean | false | If user-defined cron-jobs (beach-cron-hourly.sh) should be enabled |
5960

root-files/opt/flownative/lib/beach.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ export BEACH_INSTANCE_NAME=${BEACH_INSTANCE_NAME:-}
3232
export BEACH_PROJECT_NAME=${BEACH_PROJECT_NAME:-}
3333
3434
export BEACH_FLOW_BASE_CONTEXT=${BEACH_FLOW_BASE_CONTEXT:-Production}
35-
export BEACH_FLOW_SUB_CONTEXT=${BEACH_FLOW_SUB_CONTEXT:-}
36-
if [ -z ${BEACH_FLOW_SUB_CONTEXT} ]; then
37-
export BEACH_FLOW_CONTEXT=${BEACH_FLOW_BASE_CONTEXT}/Beach/Instance
35+
export BEACH_FLOW_SUB_CONTEXT=${BEACH_FLOW_SUB_CONTEXT:-Instance}
36+
export BEACH_FLOW_CONTEXT=${BEACH_FLOW_BASE_CONTEXT}/Beach/${BEACH_FLOW_SUB_CONTEXT}
37+
if [[ ! -v FLOW_CONTEXT ]]; then
38+
export FLOW_CONTEXT=${BEACH_FLOW_CONTEXT}
3839
else
39-
export BEACH_FLOW_CONTEXT=${BEACH_FLOW_BASE_CONTEXT}/Beach/${BEACH_FLOW_SUB_CONTEXT}
40+
export FLOW_CONTEXT
4041
fi
41-
export FLOW_CONTEXT=${BEACH_FLOW_CONTEXT}
4242
4343
export BEACH_DATABASE_HOST=${BEACH_DATABASE_HOST:-}
4444
export BEACH_DATABASE_SOCKET=${BEACH_DATABASE_SOCKET:-}

0 commit comments

Comments
 (0)