Skip to content

Commit

Permalink
Merge pull request #117 from arnaudbore/add_container
Browse files Browse the repository at this point in the history
Add containers
  • Loading branch information
arnaudbore authored Feb 16, 2021
2 parents a69fd7f + 6555d06 commit e87b634
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 46 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
# CHANGELOG

## 2.1.6 - 2021-02-16

- New Containers
- Fix pypi package

## 2.1.5 - 2021-01-04

- Add possibility to be not case sensitive
- Fix issue 34: dcm2bids not ordering runs chronologically
- Fix issue 34: dcm2bids not ordering runs chronologically

## 2.1.4 - 2019-04-04

Expand Down
44 changes: 0 additions & 44 deletions Singularity

This file was deleted.

26 changes: 26 additions & 0 deletions containers/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From ubuntu:latest
ENV DEBIAN_FRONTEND=noninteractive

MAINTAINER Arnaud Boré <[email protected]>

RUN apt-get update
RUN apt-get -y upgrade

RUN apt-get -y install wget build-essential cmake git pigz \
nodejs python3 python3-pip unzip

RUN pip3 install dcm2bids

# Install dcm2niix from github
ENV DCM2NIIX_VERSION="v1.0.20201102"

WORKDIR /usr/local/src
RUN git clone https://github.com/rordenlab/dcm2niix.git
WORKDIR /usr/local/src/dcm2niix
RUN git checkout tags/${DCM2NIIX_VERSION} -b install
RUN mkdir build
WORKDIR /usr/local/src/dcm2niix/build
RUN cmake ..
RUN make install

WORKDIR /
2 changes: 2 additions & 0 deletions containers/singularity.def
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
BootStrap: docker
From: unfmontreal/dcm2bids:latest
2 changes: 1 addition & 1 deletion dcm2bids/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"""This module take care of the versioning"""

# dcm2bids version
__version__ = "2.1.5"
__version__ = "2.1.6"


import logging
Expand Down
16 changes: 16 additions & 0 deletions docs/1-usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,19 @@ To build the configuration file, you need to have a example of the sidecars. You
Create basic BIDS files and directories in the output directory (by default folder where the script is launched).

[json-editor]: http://jsoneditoronline.org/


# Containers

You can also use all the tools through docker or singularity images.

## Docker
Download the latest release of the Docker container for dcm2bids:

`docker pull unfmontreal/dcm2bids:latest`

## Singularity

Build the latest singularity image:

`singularity build dcm2bids.sif containers/singularity.def`

0 comments on commit e87b634

Please sign in to comment.