Repository navigation
chore(#166): deduplicate compose FDB services and use Compose v2 - #187
Merged
s2x merged 1 commit intoNov 6, 2026
Merged
Conversation
s2x
deleted the
chore/issue-166-maintainability-deduplicate-compose-clus
branch
November 6, 2026 21:56
This was referenced Nov 6, 2026
Closed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What changed
The five FDB services repeated the image, coordinator string, environment
entries, entrypoint, restart policy, healthcheck and common volume mounts, and
the CI e2e job still used the legacy
docker-composebinary plus a duplicatetenant-mode step.
docker-compose.yml: sharedx-fdb-*anchors for the image, coordinatorstring (
FDB_CLUSTER_FILE_CONTENTS), environment map, entrypoint, restartpolicy, healthcheck and the two common volume items. All five FDB services
use them; the coordinator string now appears once.
fdb-configandphpentrypoints write the cluster file fromFDB_CLUSTER_FILE_CONTENTSinstead of a hardcoded string..github/workflows/ci.ymle2e: legacy install removed, every call usesdocker compose, and the duplicate tenant-mode step is replaced by a boundedwait for the
fdb-configsentinel healthcheck.CHANGELOG.mdrecords the change under[Unreleased]/Changed.Closes #166
How it was tested
docker compose config --format jsononmastervsHEAD: identicaleffective
FDB_PORT,FDB_BG_URL, cluster contents, restart policy,healthcheck and volume mounts for all five FDB services; only the intended
entrypoint/env changes differ.
grep -c 'docker:docker@' docker-compose.yml= 1;fdb-configandphpwrite the exact string plus one newline.
docker compose up -dof the six services: available after 7 s,fdb-confighealthy after 7 s,tenant_mode: optional_experimental;docker compose ps -q,execanddown -vwork.make test: 926 tests, 2500 assertions, 6 skipped.make test-integration: 309 tests, 1233 assertions, 6 skipped.docker compose config -q,bin/lint.sh,actionlint,git diff --checkpass.
Checklist
CHANGELOG.mdupdated under[Unreleased]chore: ...)