Skip to content

Commit

Permalink
changes for version 0.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Jakub Kaczmarzyk committed Aug 2, 2018
1 parent 7af8981 commit 4ca325e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
19 changes: 10 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ _Neurodocker_ is a command-line program that generates custom Dockerfiles and Si
Use the _Neurodocker_ Docker image (recommended):

```shell
$ docker run --rm kaczmarj/neurodocker:0.4.0 --help
$ docker run --rm kaczmarj/neurodocker:0.4.1 --help
```

_Note_: Do not use the `-t/--tty` flag with `docker run` or non-printable characters will be a part of the output (see [moby/moby#8513 (comment)](https://github.com/moby/moby/issues/8513#issuecomment-216191236)).
Expand Down Expand Up @@ -126,15 +126,15 @@ usage: neurodocker generate docker [-h] [-b BASE] [-p {apt,yum}]
[--minc [...]] [--miniconda [...]]
[--mrtrix3 [[...]]] [--neurodebian [...]]
[--petpvc [...]] [--spm12 [...]]
[--add ADD [ADD ...]] [--arg ARG [ARG ...]]
[--cmd CMD [CMD ...]]
[--vnc [...]] [--add ADD [ADD ...]]
[--arg ARG [ARG ...]] [--cmd CMD [CMD ...]]
[--expose EXPOSE [EXPOSE ...]]
[--label LABEL [LABEL ...]]
[--volume VOLUME [VOLUME ...]]
optional arguments:
-h, --help show this help message and exit
-b BASE, --base BASE Base Docker image. Eg, ubuntu:17.04
-b BASE, --base BASE Base Docker image. E.g., debian:stretch
-p {apt,yum}, --pkg-manager {apt,yum}
Linux package manager.
--add-to-entrypoint ADD_TO_ENTRYPOINT
Expand Down Expand Up @@ -175,7 +175,7 @@ optional arguments:
# Generate Singularity recipe

```
usage: neurodocker generate singularity [-h] [-b BASE] [-p {apt,yum}]
usage: neurodocker generate singularity [-h] [-b BASE] [-p {yum,apt}]
[--add-to-entrypoint ADD_TO_ENTRYPOINT]
[--copy COPY [COPY ...]]
[--install INSTALL [INSTALL ...]]
Expand All @@ -192,10 +192,11 @@ usage: neurodocker generate singularity [-h] [-b BASE] [-p {apt,yum}]
[--mrtrix3 [[...]]]
[--neurodebian [...]]
[--petpvc [...]] [--spm12 [...]]
[--vnc [...]]
optional arguments:
-h, --help show this help message and exit
-b BASE, --base BASE Base Docker image. Eg, ubuntu:17.04
-b BASE, --base BASE Base Docker image. E.g., debian:stretch
-p {apt,yum}, --pkg-manager {apt,yum}
Linux package manager.
--add-to-entrypoint ADD_TO_ENTRYPOINT
Expand Down Expand Up @@ -237,11 +238,11 @@ _Note_: Do not use the `-t/--tty` flag with `docker run` or non-printable charac
### Docker

```shell
$ docker run --rm kaczmarj/neurodocker:0.4.0 generate docker \
$ docker run --rm kaczmarj/neurodocker:0.4.1 generate docker \
--base debian:stretch --pkg-manager apt --ants version=2.2.0

# Build image by piping Dockerfile to `docker build`
$ docker run --rm kaczmarj/neurodocker:0.4.0 generate docker \
$ docker run --rm kaczmarj/neurodocker:0.4.1 generate docker \
--base debian:stretch --pkg-manager apt --ants version=2.2.0 | docker build -
```

Expand All @@ -250,7 +251,7 @@ $ docker run --rm kaczmarj/neurodocker:0.4.0 generate docker \
Install ANTs on Debian 9 (Stretch).

```shell
$ docker run --rm kaczmarj/neurodocker:0.4.0 generate singularity \
$ docker run --rm kaczmarj/neurodocker:0.4.1 generate singularity \
--base debian:stretch --pkg-manager apt --ants version=2.2.0
```

Expand Down
2 changes: 1 addition & 1 deletion neurodocker/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Copied from https://github.com/nipy/nipype/blob/master/nipype/info.py.
"""

__version__ = '0.4.1-dev'
__version__ = '0.4.1'


def get_gitversion():
Expand Down

0 comments on commit 4ca325e

Please sign in to comment.