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 Singularity support for "dockerFile" #1938

Merged

Conversation

misterbrandonwalker
Copy link
Contributor

Add ability to use dockerFile with singularity.

  1. Convert dockerFile into singularity recipe via sypthon.
  2. Then use singularity build to build image

Copy link
Member

@mr-c mr-c left a comment

Choose a reason for hiding this comment

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

Thank you @misterbrandonwalker !

Can you add a test?

Copy link

codecov bot commented Nov 7, 2023

Codecov Report

Attention: 2 lines in your changes are missing coverage. Please review.

Comparison is base (e4b5d92) 83.77% compared to head (b8338ca) 83.58%.

Files Patch % Lines
cwltool/singularity.py 90.00% 0 Missing and 2 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1938      +/-   ##
==========================================
- Coverage   83.77%   83.58%   -0.19%     
==========================================
  Files          46       46              
  Lines        8201     8217      +16     
  Branches     2178     2146      -32     
==========================================
- Hits         6870     6868       -2     
- Misses        855      863       +8     
- Partials      476      486      +10     

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

cwltool/singularity.py Outdated Show resolved Hide resolved
cwltool/singularity.py Outdated Show resolved Hide resolved
cwltool/singularity.py Outdated Show resolved Hide resolved
@mr-c
Copy link
Member

mr-c commented Nov 20, 2023

@misterbrandonwalker Does make test pass for you? Alternatively, tox -e py311-unit (replacing 311 with whatever Python version you have)

@misterbrandonwalker
Copy link
Contributor Author

misterbrandonwalker commented Nov 20, 2023

The test passes for me with tox I think the issue now is with how I am using current working directory rather than /tmp I see permissions error on the runner
https://github.com/common-workflow-language/cwltool/actions/runs/6932721232/job/18861573891#step:8:1696

However I added to comment here if I try to use /tmp to execute singularity it will crash
main...misterbrandonwalker:cwltool:singularityFile#diff-2cbd89e23f6e4c3f1f7df787bc1ebf9f32408c48b13125b70c6c31111a119b1aR173

FATAL: Unable to create build: 'noexec' mount option set on /tmp, temporary root filesystem

cwltool/singularity.py Outdated Show resolved Hide resolved
Copy link
Member

@mr-c mr-c left a comment

Choose a reason for hiding this comment

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

Thank you @misterbrandonwalker !

@mr-c mr-c enabled auto-merge (squash) December 5, 2023 15:15
@mr-c mr-c disabled auto-merge December 5, 2023 15:22
@mr-c mr-c merged commit 65ddfc9 into common-workflow-language:main Dec 5, 2023
44 of 45 checks passed
@mr-c mr-c changed the title add singularityFile add Singularity support for "dockerFile" Dec 11, 2023
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.

2 participants