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

Refactor Python and Orthanc Dockerfiles #583

Open
wants to merge 9 commits into
base: main
Choose a base branch
from

Conversation

jeremyestein
Copy link
Contributor

@jeremyestein jeremyestein commented Dec 18, 2024

Description

Fixes #{issue_number}:

A cut down version of #400 , with just the Dockerfile de-duping. If we decide #400 is too risky to merge now, we can at least merge this one and do the rest of #400 later. The advantage is it enables further work on the Dockerfiles, such as switching to uv.

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

Copy link

codecov bot commented Dec 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 85.17%. Comparing base (6435ebb) to head (98fa689).

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #583      +/-   ##
==========================================
- Coverage   87.38%   85.17%   -2.22%     
==========================================
  Files          76       72       -4     
  Lines        3386     3116     -270     
==========================================
- Hits         2959     2654     -305     
- Misses        427      462      +35     

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

@jeremyestein jeremyestein marked this pull request as ready for review December 18, 2024 18:01
Copy link
Contributor

@p-j-smith p-j-smith left a comment

Choose a reason for hiding this comment

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

looking really nice - just a question around downloading the DICOM spec for Orthanc Anon

Comment on lines +64 to +67
COPY ./orthanc/orthanc-anon/plugin/download_dicom_spec.py /etc/orthanc/download_dicom_spec.py
RUN --mount=type=cache,target=/root/.cache \
python3 /etc/orthanc/download_dicom_spec.py

Copy link
Contributor

Choose a reason for hiding this comment

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

downloading the Python spec is pretty slow to do, so I think ideally this would be one of the earlier layers in the image. Not sure the best way to do that? Either include it in Raw, or have separate Raw and Anon images?

Copy link
Contributor

@stefpiatek stefpiatek 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, will leave it to you and Paul to work out the best way to have the python spec downloaded and cached

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.

3 participants