Skip to content

Commit e9230eb

Browse files
fix: docker build 8.9 image
1 parent 917db63 commit e9230eb

1 file changed

Lines changed: 12 additions & 2 deletions

File tree

.github/workflows/webapp-e2e-tests-on-demand.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,15 @@ jobs:
8686
exit 1
8787
fi
8888
fi
89+
90+
# Non-standalone setups (8.8/8.9) require DATABASE for compose interpolation.
91+
if [[ "${{ matrix.non_standalone }}" != "true" ]]; then
92+
echo "DATABASE=elasticsearch" >> "$GITHUB_ENV"
93+
if [[ -f "$GITHUB_WORKSPACE/${{ matrix.config_path }}/.env" ]] && ! grep -q '^DATABASE=' "$GITHUB_WORKSPACE/${{ matrix.config_path }}/.env"; then
94+
echo "DATABASE=elasticsearch" >> "$GITHUB_WORKSPACE/${{ matrix.config_path }}/.env"
95+
fi
96+
fi
97+
8998
echo "ENV_FILE_ABS=$ENV_FILE_ABS" >> "$GITHUB_ENV"
9099
echo "ENV_FILE_REL=$ENV_FILE_REL" >> "$GITHUB_ENV"
91100
# Filter out comments and empty lines before adding to GITHUB_ENV
@@ -127,19 +136,20 @@ jobs:
127136
docker compose --env-file "$ENV_FILE_REL" up -d
128137
else
129138
echo "Using standalone camunda container"
139+
export DATABASE="${DATABASE:-elasticsearch}"
130140
if [[ "${{ matrix.tasklist_mode }}" == "v1" ]]; then
131141
echo "Starting with Tasklist V1 mode enabled"
132142
CAMUNDA_TASKLIST_V2_MODE_ENABLED=false \
133143
CAMUNDA_SECURITY_AUTHENTICATION_UNPROTECTEDAPI=true \
134144
CAMUNDA_SECURITY_AUTHORIZATIONS_ENABLED=false \
135145
CAMUNDA_SECURITY_AUTHENTICATION_METHOD=NONE \
136-
DATABASE=elasticsearch docker compose up -d camunda
146+
docker compose up -d camunda
137147
else
138148
echo "Starting with default Tasklist V2 mode"
139149
CAMUNDA_SECURITY_AUTHENTICATION_UNPROTECTEDAPI=true \
140150
CAMUNDA_SECURITY_AUTHORIZATIONS_ENABLED=false \
141151
CAMUNDA_SECURITY_AUTHENTICATION_METHOD=NONE \
142-
DATABASE=elasticsearch docker compose up -d camunda
152+
docker compose up -d camunda
143153
fi
144154
fi
145155
working-directory: ${{ env.CONFIG_PATH }}

0 commit comments

Comments
 (0)