Skip to content

Commit 0bffc1a

Browse files
authored
Merge pull request miykael#86 from miykael/move_pages_to_docs
Make gh-pages more beautiful and move them into /docs
2 parents 632d4c5 + 514b385 commit 0bffc1a

File tree

196 files changed

+619798
-90
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

196 files changed

+619798
-90
lines changed

Dockerfile

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# pull request on our GitHub repository:
66
# https://github.com/kaczmarj/neurodocker
77
#
8-
# Timestamp: 2018-05-07 20:43:57
8+
# Timestamp: 2018-05-14 11:52:36
99

1010
FROM neurodebian:stretch-non-free
1111

@@ -129,16 +129,16 @@ RUN conda create -y -q --name neuro python=3.6 \
129129
# User-defined BASH instruction
130130
RUN bash -c "source activate neuro && jupyter nbextension enable exercise2/main && jupyter nbextension enable spellchecker/main"
131131

132-
# User-defined instruction
133-
RUN mkdir -p ~/.jupyter && echo c.NotebookApp.ip = \"0.0.0.0\" > ~/.jupyter/jupyter_notebook_config.py
132+
# User-defined BASH instruction
133+
RUN bash -c "mkdir -p ~/.jupyter && echo c.NotebookApp.ip = \\"0.0.0.0\\" > ~/.jupyter/jupyter_notebook_config.py"
134134

135135
USER root
136136

137-
# User-defined instruction
138-
RUN mkdir /data && chmod 777 /data && chmod a+s /data
137+
# User-defined BASH instruction
138+
RUN bash -c "mkdir /data && chmod 777 /data && chmod a+s /data"
139139

140-
# User-defined instruction
141-
RUN mkdir /output && chmod 777 /output && chmod a+s /output
140+
# User-defined BASH instruction
141+
RUN bash -c "mkdir /output && chmod 777 /output && chmod a+s /output"
142142

143143
USER neuro
144144

@@ -150,10 +150,13 @@ RUN bash -c "curl -L https://files.osf.io/v1/resources/fvuh8/providers/osfstorag
150150

151151
COPY [".", "/home/neuro/nipype_tutorial"]
152152

153+
# User-defined BASH instruction
154+
RUN bash -c "printf \"[user]\n\tname = miykael\n\temail = michaelnotter@hotmail.com\n\" > ~/.gitconfig"
155+
153156
USER root
154157

155-
# User-defined instruction
156-
RUN chown -R neuro /home/neuro/nipype_tutorial
158+
# User-defined BASH instruction
159+
RUN bash -c "chown -R neuro /home/neuro/nipype_tutorial"
157160

158161
# User-defined BASH instruction
159162
RUN bash -c "rm -rf /opt/conda/pkgs/*"
@@ -228,19 +231,19 @@ RUN echo '{ \
228231
\n "source activate neuro && jupyter nbextension enable exercise2/main && jupyter nbextension enable spellchecker/main" \
229232
\n ], \
230233
\n [ \
231-
\n "run", \
234+
\n "run_bash", \
232235
\n "mkdir -p ~/.jupyter && echo c.NotebookApp.ip = \\\"0.0.0.0\\\" > ~/.jupyter/jupyter_notebook_config.py" \
233236
\n ], \
234237
\n [ \
235238
\n "user", \
236239
\n "root" \
237240
\n ], \
238241
\n [ \
239-
\n "run", \
242+
\n "run_bash", \
240243
\n "mkdir /data && chmod 777 /data && chmod a+s /data" \
241244
\n ], \
242245
\n [ \
243-
\n "run", \
246+
\n "run_bash", \
244247
\n "mkdir /output && chmod 777 /output && chmod a+s /output" \
245248
\n ], \
246249
\n [ \
@@ -263,11 +266,15 @@ RUN echo '{ \
263266
\n ] \
264267
\n ], \
265268
\n [ \
269+
\n "run_bash", \
270+
\n "printf \"[user]\\\n\\tname = miykael\\\n\\temail = michaelnotter@hotmail.com\\\n\" > ~/.gitconfig" \
271+
\n ], \
272+
\n [ \
266273
\n "user", \
267274
\n "root" \
268275
\n ], \
269276
\n [ \
270-
\n "run", \
277+
\n "run_bash", \
271278
\n "chown -R neuro /home/neuro/nipype_tutorial" \
272279
\n ], \
273280
\n [ \
@@ -289,6 +296,6 @@ RUN echo '{ \
289296
\n ] \
290297
\n ] \
291298
\n ], \
292-
\n "generation_timestamp": "2018-05-07 20:43:57", \
299+
\n "generation_timestamp": "2018-05-14 11:52:36", \
293300
\n "neurodocker_version": "0.3.2" \
294301
\n}' > /neurodocker/neurodocker_specs.json

create_dockerfile.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,17 @@ docker run --rm kaczmarj/neurodocker:v0.3.2 generate -b neurodebian:stretch-non-
1616
env_name="neuro" \
1717
activate=True \
1818
--run-bash "source activate neuro && jupyter nbextension enable exercise2/main && jupyter nbextension enable spellchecker/main" \
19-
--run 'mkdir -p ~/.jupyter && echo c.NotebookApp.ip = \"0.0.0.0\" > ~/.jupyter/jupyter_notebook_config.py' \
19+
--run-bash 'mkdir -p ~/.jupyter && echo c.NotebookApp.ip = \"0.0.0.0\" > ~/.jupyter/jupyter_notebook_config.py' \
2020
--user=root \
21-
--run 'mkdir /data && chmod 777 /data && chmod a+s /data' \
22-
--run 'mkdir /output && chmod 777 /output && chmod a+s /output' \
21+
--run-bash 'mkdir /data && chmod 777 /data && chmod a+s /data' \
22+
--run-bash 'mkdir /output && chmod 777 /output && chmod a+s /output' \
2323
--user=neuro \
2424
--run-bash 'source activate neuro && cd /data && datalad install -r ///workshops/nih-2017/ds000114 && cd ds000114 && datalad update -r && datalad get -r sub-01/ses-test/anat sub-01/ses-test/func/*fingerfootlips*' \
2525
--run-bash 'curl -L https://files.osf.io/v1/resources/fvuh8/providers/osfstorage/580705089ad5a101f17944a9 -o /data/ds000114/derivatives/fmriprep/mni_icbm152_nlin_asym_09c.tar.gz && tar xf /data/ds000114/derivatives/fmriprep/mni_icbm152_nlin_asym_09c.tar.gz -C /data/ds000114/derivatives/fmriprep/. && rm /data/ds000114/derivatives/fmriprep/mni_icbm152_nlin_asym_09c.tar.gz && find /data/ds000114/derivatives/fmriprep/mni_icbm152_nlin_asym_09c -type f -not -name ?mm_T1.nii.gz -not -name ?mm_brainmask.nii.gz -not -name ?mm_tpm*.nii.gz -delete' \
2626
--copy . "/home/neuro/nipype_tutorial" \
27+
--run-bash 'printf "[user]\n\tname = miykael\n\temail = michaelnotter@hotmail.com\n" > ~/.gitconfig' \
2728
--user=root \
28-
--run 'chown -R neuro /home/neuro/nipype_tutorial' \
29+
--run-bash 'chown -R neuro /home/neuro/nipype_tutorial' \
2930
--run-bash 'rm -rf /opt/conda/pkgs/*' \
3031
--user=neuro \
3132
--workdir /home/neuro/nipype_tutorial \

0 commit comments

Comments
 (0)