Skip to content

Commit

Permalink
Merge branch 'master' of github.com:ReproNim/containers
Browse files Browse the repository at this point in the history
* 'master' of github.com:ReproNim/containers:
  fix: add --no-datalad-get for bids-mriqc invocation (current and future added)
  • Loading branch information
yarikoptic committed Nov 5, 2024
2 parents aa628d1 + 3d5b175 commit 7cdd150
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .datalad/config
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
cmdexec = {img_dspath}/scripts/singularity_cmd run {img} {cmd}
image = images/bids/bids-mindboggle--0.0.4-1.sing
[datalad "containers.bids-mriqc"]
cmdexec = {img_dspath}/scripts/singularity_cmd run {img} {cmd}
cmdexec = {img_dspath}/scripts/singularity_cmd run {img} --no-datalad-get {cmd}
image = images/bids/bids-mriqc--24.0.2.sing
[datalad "containers.bids-mrtrix3-connectome"]
cmdexec = {img_dspath}/scripts/singularity_cmd run {img} {cmd}
Expand Down
7 changes: 6 additions & 1 deletion scripts/create_singularities
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,11 @@ export LC_ALL="C.UTF-8"
str(imagefile),
str(singfile.sourcefile),
)
base_opts = ' '
if familyname == 'bids-mriqc':
# need to explicitly specify option to avoid use of datalad inside
# ref: https://github.com/ReproNim/containers/issues/131
base_opts = ' --no-datalad-get '
self.runcmd(
"datalad",
"containers-add",
Expand All @@ -276,7 +281,7 @@ export LC_ALL="C.UTF-8"
str(imagefile),
"--update",
"--call-fmt",
"{img_dspath}/scripts/singularity_cmd run {img} {cmd}",
"{img_dspath}/scripts/singularity_cmd run {img}" + base_opts + "{cmd}",
)
# TODO: later make it work with updating existing one. We will not
# be able to use containers-add --update since original URL is
Expand Down

0 comments on commit 7cdd150

Please sign in to comment.