[rhanka]

Summary

• Revert the broad Docker Compose/tools changes that were merged with PR fix(dataprep): connect SCW workers without bastion #93 but were not required for the deces-ui MailDev failure.
• Keep the Makefile expansion fixes that are required to prevent local make version config / backend version resolution from hanging.
• Move the SMTP MailDev pin to maildev/maildev:2.2.1, which keeps /email compatible and avoids the vulnerable 2.0.5 pin.

Validation

• maildev/maildev:2.2.1 local Docker probe: GET /email returns [].
• git diff --check origin/main..HEAD
• make version config GIT_BRANCH=fix/narrow-dataprep-prereq-changes
• make frontend-docker-check GIT_BRANCH=fix/narrow-dataprep-prereq-changes
• make -C packages/deces-backend DATA_DIR=data NPM_AUDIT_DRY_RUN=true docker-check-backend GIT_BRANCH=fix/narrow-dataprep-prereq-changes

Trace

PR #93 was merged at ed7d1b96 before this cleanup. This PR carries the cleanup onto main explicitly.

Summary by CodeRabbit

• New Features

  • Added extra environment and smoke-check steps to verify docker-compose availability during remote validation.
  • Bundled a specific docker-compose version with packaged tooling and install flows for more consistent setup.

• Bug Fixes

  • Improved compatibility for systems using docker-compose by standardizing command handling.
  • Updated SSH wait behavior to be less brittle during connection retries.

• Tests

  • Adjusted timeout-related checks to match the updated SSH behavior.

[coderabbitai]

Caution

Review failed

The pull request is closed.

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 733b5533-1d71-40b5-bf37-6a97b0ee6a1d

📥 Commits

Reviewing files that changed from the base of the PR and between a8d9f09 and 62c1fc4.

📒 Files selected for processing (9)

• Makefile
• packages/dataprep-backend/Makefile
• packages/deces-dataprep/Makefile
• packages/deces-infra/Makefile
• packages/deces-infra/docker-compose-smtp.yml
• packages/deces-ui/Makefile
• packages/tools/.travis.yml
• packages/tools/Makefile
• packages/tools/tests/test_remote_ssh_timeouts.sh

---

📝 Walkthrough

Walkthrough

This PR migrates multiple Makefiles and Travis CI configuration from the "docker compose" plugin to an explicit "docker-compose" binary, adding download/packaging steps and smoke-check commands. It also simplifies an SSH wait-ssh retry probe and its test, plus makes minor unrelated env/version tweaks.

Changes

Docker Compose CLI Migration

Layer / File(s)	Summary
Remote smoke-check additions Makefile, packages/deces-dataprep/Makefile	Adds remote commands printing "docker-compose version" to base-image smoke-test targets.
dataprep-backend DC variable and target messages packages/dataprep-backend/Makefile	Redefines DC to the literal "docker-compose" string and updates elasticsearch/start target messages and commands to use docker-compose directly.
dataprep-backend package/depackage handling packages/dataprep-backend/Makefile	Adds docker-compose binary download and packaging into the release tarball, and replaces the depackage version check with logic copying the binary to a local bin directory.
tools Makefile DC variable and install wrapper packages/tools/Makefile	Redefines DC to point at docker-compose directly; Docker install skips docker-compose-plugin and instead creates a compatibility wrapper script when docker-compose is missing.
Travis CI docker-compose installation packages/tools/.travis.yml	Adds DOCKER_COMPOSE_VERSION, removes docker-compose-plugin from apt, downloads/installs a specific docker-compose binary, and updates the version verification command.

SSH Wait-SSH Retry Simplification

Layer / File(s)	Summary
wait-ssh probe simplification and test update packages/tools/Makefile, packages/tools/tests/test_remote_ssh_timeouts.sh	Replaces the temp-file-based SSH probe and publickey-error handling with a simpler sleep-based probe; test now asserts removal of a stale ConnectTimeout=1 override instead of publickey error checks.

Misc Build Config Cleanup

Layer / File(s)	Summary
Environment export and image/version tweaks packages/deces-infra/Makefile, packages/deces-infra/docker-compose-smtp.yml, packages/deces-ui/Makefile	Simplifies ES_UID/ES_MEM_KUBE export declarations, bumps the maildev image tag from 2.0.5 to 2.2.1, and changes frontend filename variable assignment from immediate to deferred expansion.

Estimated code review effort: 3 (Moderate) | ~25 minutes

Possibly related PRs

• matchID-project/matchID#28: Both PRs extend the remote base-image smoke-test flow (deces-ui-base-image-smoke / remote-base-image-smoke), directly touching the same smoke-check code path.

Suggested reviewers: cristianpb

✨ Finishing Touches

📝 Generate docstrings

• Create stacked PR
• Commit on current branch

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch fix/narrow-dataprep-prereq-changes

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}