Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Docker Compose<22.0 #598

Merged
merged 1 commit into from
Feb 18, 2025
Merged

Add support for Docker Compose<22.0 #598

merged 1 commit into from
Feb 18, 2025

Conversation

p-j-smith
Copy link
Contributor

@p-j-smith p-j-smith commented Feb 13, 2025

Fixes #597

  • Remove use of profiles with docker compose
  • Always expose the CLI_PIXL_DB_PORT on the postgres container
  • Remove EXTERNAL_PIXL_DB env var as we're no longer using profiles
  • Remove second postgres container used in integration tests; use the same postgres instance for PIXL DB and Orthanc Raw
  • We can still have PIXL DB running in an external postgres instance (by setting the relevant env vars), but we're not testing for this in CI
  • Update docs to reflect changes
  • tested on dev instance on GAE

Description

Fixes #{issue_number}: A few words or sentences describing the changes proposed in this pull request (PR).

Type of change

Please delete options accordingly to the description.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

Suggested Checklist

  • I have performed a self-review of my own code.
  • I have made corresponding changes to the documentation.
  • My changes generate no new warnings.
  • I have commented my code, particularly in hard-to-understand areas.
  • I have passed on my local host device. (see further details at the CONTRIBUTING document)
  • Make sure your branch is up-to-date with main branch. See CONTRIBUTING for a general example to syncronise your branch with the main branch.
  • I have requested review to this PR.
  • I have addressed and marked as resolved all the review comments in my PR.
  • Finally, I have selected squash and merge

Always expose the CLI_PIXL_DB_PORT on the postgres container
Update docs to reflect changes
Remove EXTERNAL_PIXL_DB env var as we're no longer using profiles
Copy link

codecov bot commented Feb 13, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 87.61%. Comparing base (3f3419c) to head (be4142a).
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #598      +/-   ##
==========================================
- Coverage   87.64%   87.61%   -0.03%     
==========================================
  Files          76       76              
  Lines        3512     3505       -7     
==========================================
- Hits         3078     3071       -7     
  Misses        434      434              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@tomaroberts tomaroberts left a comment

Choose a reason for hiding this comment

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

Looks good Paul and just like it used to! 😆

Go for it.

@p-j-smith p-j-smith merged commit aa702e3 into main Feb 18, 2025
11 checks passed
@p-j-smith p-j-smith deleted the paul/remove-profiles branch February 18, 2025 08:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

pixl dc up fails with Docker Compose versions <2.20 as the required flag is not supported
2 participants