Merge branch 'master' of github.com:miykael/nipype_tutorial

Author: miykael

.circleci/config.yml

@@ -16,12 +16,12 @@ jobs:
           name: docker build 1
           no_output_timeout: 60m
           command: |
-            docker build -t miykael/nipype_tutorial:$CIRCLE_BRANCH .
+            docker build -t miykael/nipype_tutorial:$(echo $CIRCLE_BRANCH | sed 's|/|_|g') .
       - run:
           name: run tests 1
           no_output_timeout: 120m
           command: |
-            docker run -it --rm miykael/nipype_tutorial:$CIRCLE_BRANCH python /home/neuro/nipype_tutorial/test_notebooks.py 1
+            docker run -it --rm miykael/nipype_tutorial:$(echo $CIRCLE_BRANCH | sed 's|/|_|g') python /home/neuro/nipype_tutorial/test_notebooks.py 1
   test_2:
     docker:
       - image: docker:18.05.0-ce-git
@@ -33,12 +33,12 @@ jobs:
           name: docker build 2
           no_output_timeout: 60m
           command: |
-            docker build -t miykael/nipype_tutorial:$CIRCLE_BRANCH .
+            docker build -t miykael/nipype_tutorial:$(echo $CIRCLE_BRANCH | sed 's|/|_|g') .
       - run:
           name: run tests 2
           no_output_timeout: 120m
           command: |
-            docker run -it --rm miykael/nipype_tutorial:$CIRCLE_BRANCH python /home/neuro/nipype_tutorial/test_notebooks.py 2
+            docker run -it --rm miykael/nipype_tutorial:$(echo $CIRCLE_BRANCH | sed 's|/|_|g') python /home/neuro/nipype_tutorial/test_notebooks.py 2
   test_3:
     docker:
       - image: docker:18.05.0-ce-git
@@ -50,12 +50,12 @@ jobs:
           name: docker build 3
           no_output_timeout: 60m
           command: |
-            docker build -t miykael/nipype_tutorial:$CIRCLE_BRANCH .
+            docker build -t miykael/nipype_tutorial:$(echo $CIRCLE_BRANCH | sed 's|/|_|g') .
       - run:
           name: run tests 3
           no_output_timeout: 120m
           command: |
-            docker run -it --rm miykael/nipype_tutorial:$CIRCLE_BRANCH python /home/neuro/nipype_tutorial/test_notebooks.py 3
+            docker run -it --rm miykael/nipype_tutorial:$(echo $CIRCLE_BRANCH | sed 's|/|_|g') python /home/neuro/nipype_tutorial/test_notebooks.py 3
 
 workflows:
   version: 2

Dockerfile

@@ -1,5 +1,5 @@
-# Generated by Neurodocker version 0.4.2-dev
-# Timestamp: 2018-10-10 04:25:17 UTC
+# Generated by Neurodocker version 0.4.1-22-g7c44e01
+# Timestamp: 2018-10-10 14:43:05 UTC
 # 
 # Thank you for using Neurodocker. If you discover any issues
 # or ways to improve this software, please submit an issue or

Singularity

@@ -1,5 +1,5 @@
-# Generated by Neurodocker version 0.4.2-dev
-# Timestamp: 2018-10-10 04:25:18 UTC
+# Generated by Neurodocker version 0.4.1-22-g7c44e01
+# Timestamp: 2018-10-10 14:43:07 UTC
 # 
 # Thank you for using Neurodocker. If you discover any issues
 # or ways to improve this software, please submit an issue or

index.ipynb

@@ -176,6 +176,9 @@
    ],
    "source": [
     "%%html\n",
+    "\n",
+    " <!–– TUTORIAL USERS: PLEASE EXECUTE THIS CELL ––>\n",
+    "\n",
     "<style>.container { width:75% !important; }</style>\n",
     "<link rel='stylesheet' type='text/css' href='static/css/mobile.css'>\n",
     "<link rel='stylesheet' type='text/css' href='static/css/homepage.css'>\n",