Skip to content

Conversation

@pcrespov
Copy link
Member

@pcrespov pcrespov commented Oct 13, 2025

What do these changes do?

This refactor improves the maintainability of docker-compose.yml by grouping related environment variables into reusable x-* sections with anchors and references/aliases. For instance, settings for common services such as postgres, redis and rabbit and define only once and used aliases to inject them in the service environment section. This approach reduces duplication, simplifies updates, and improves overall readability.

Related issue/s

  • Maintenance

How to test

Compare `.satck-simcore-*.yml produce in master branch

git checkout master
make .stack-simcore-production.yml
mv .stack-simcore-production.yml .stack-simcore-production.master-ignore.yml

diff .stack-simcore-production.master-ignore.yml .stack-simcore-production.new-ignore.yml

Dev-ops

Please check that this has not side-effects on the compose done on the ops side

@pcrespov pcrespov self-assigned this Oct 13, 2025
@pcrespov pcrespov added the t:maintenance Some planned maintenance work label Oct 13, 2025
@pcrespov pcrespov added this to the Cheops milestone Oct 13, 2025
@pcrespov pcrespov enabled auto-merge (squash) October 13, 2025 08:11
@pcrespov pcrespov added the 🤖-automerge marks PR as ready to be merged for Mergify label Oct 13, 2025
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR refactors docker-compose.yml to improve maintainability by consolidating related environment variables into reusable x-* anchor sections. The refactor replaces duplicated environment variable definitions across services with shared configuration blocks for common services like PostgreSQL, Redis, RabbitMQ, S3, SMTP, and other simcore components.

  • Created organized x-* sections grouped by service type (3rd party services vs simcore stack services)
  • Replaced individual environment variable declarations with anchor references using <<: YAML syntax
  • Added clear section headers to improve readability and organization

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

@codecov
Copy link

codecov bot commented Oct 13, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 87.60%. Comparing base (3632ac8) to head (11ade46).
⚠️ Report is 2 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #8503      +/-   ##
==========================================
- Coverage   87.62%   87.60%   -0.02%     
==========================================
  Files        2001     2001              
  Lines       77920    77933      +13     
  Branches     1338     1338              
==========================================
- Hits        68280    68276       -4     
- Misses       9240     9257      +17     
  Partials      400      400              
Flag Coverage Δ
integrationtests 64.09% <ø> (-0.06%) ⬇️
unittests 86.31% <ø> (-0.01%) ⬇️
Components Coverage Δ
pkg_aws_library 93.59% <ø> (ø)
pkg_celery_library 84.27% <ø> (ø)
pkg_dask_task_models_library 79.33% <ø> (ø)
pkg_models_library 93.06% <ø> (ø)
pkg_notifications_library 85.20% <ø> (ø)
pkg_postgres_database 87.95% <ø> (ø)
pkg_service_integration 70.17% <ø> (ø)
pkg_service_library 70.98% <ø> (ø)
pkg_settings_library 90.20% <ø> (ø)
pkg_simcore_sdk 84.95% <ø> (+0.05%) ⬆️
agent 93.10% <ø> (ø)
api_server 91.86% <ø> (ø)
autoscaling 95.72% <ø> (ø)
catalog 92.06% <ø> (ø)
clusters_keeper 99.14% <ø> (ø)
dask_sidecar 92.38% <ø> (ø)
datcore_adapter 97.95% <ø> (ø)
director 75.72% <ø> (ø)
director_v2 90.86% <ø> (-0.14%) ⬇️
dynamic_scheduler 96.82% <ø> (ø)
dynamic_sidecar 90.44% <ø> (ø)
efs_guardian 89.83% <ø> (ø)
invitations 90.90% <ø> (ø)
payments 92.80% <ø> (ø)
resource_usage_tracker 92.22% <ø> (ø)
storage 86.28% <ø> (+0.08%) ⬆️
webclient ∅ <ø> (∅)
webserver 87.28% <57.89%> (-0.04%) ⬇️

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7f199cb...11ade46. Read the comment docs.

🚀 New features to boost your workflow:
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Copy link
Contributor

@wvangeit wvangeit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thx

Copy link
Member

@sanderegg sanderegg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks!

Copy link
Contributor

@giancarloromeo giancarloromeo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

@mergify
Copy link
Contributor

mergify bot commented Oct 13, 2025

🧪 CI Insights

Here's what we observed from your CI run for 11ade46.

✅ Passed Jobs With Interesting Signals

Pipeline Job Signal Health on master Retries 🔍 CI Insights 📄 Logs
CI system-tests Base branch is broken, but the job passed. Looks like this might be a real fix 💪 Broken 0 View View

@pcrespov
Copy link
Member Author

@mergify queue

@mergify
Copy link
Contributor

mergify bot commented Oct 13, 2025

queue

🛑 Configuration not compatible with a branch protection setting

The branch protection setting Require branches to be up to date before merging is not compatible with draft PR checks. To keep this branch protection enabled, update your Mergify configuration to enable in-place checks: set merge_queue.max_parallel_checks: 1, set every queue rule batch_size: 1, and avoid two-step CI (make merge_conditions identical to queue_conditions). Otherwise, disable this branch protection.

@sonarqubecloud
Copy link

@pcrespov pcrespov merged commit 3ca1fb6 into ITISFoundation:master Oct 13, 2025
91 of 94 checks passed
@pcrespov pcrespov deleted the mai/docker-compose-refs branch October 13, 2025 09:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🤖-automerge marks PR as ready to be merged for Mergify t:maintenance Some planned maintenance work

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants