Skip to content

Commit 3bc4e9a

Browse files
authored
update docker image (#410)
* badge update * badge test * func output tree overhaul * concurant func and dwi pipelines * sort functional and diffusion output folder organization * m2g-f file output fix * remove iteration output * update for travis test * readme update * readme update * remove travis * update file output * pass push check * Docker file overhaul, switch base image to neurodebian: bionic-non-free * initial stable dockerfile * first round of version control for dockerfile * change cpac runner to python3.7 * fix missing module issue by making them visible to python3, also change installation order * vix missing xvfbwrapper * instruction update * update * README update * finish file definition * README rough draft * remove lfs requirement
1 parent 41622d5 commit 3bc4e9a

File tree

2 files changed

+181
-196
lines changed

2 files changed

+181
-196
lines changed

Dockerfile

+8-21
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,12 @@ RUN apt-get update && \
3232
RUN pip3.7 install --upgrade pip
3333

3434

35-
# Get neurodebian config
36-
# RUN curl -sSL http://neuro.debian.net/lists/stretch.us-tn.full >> /etc/apt/sources.list.d/neurodebian.sources.list && \
37-
# apt-key add /root/.neurodebian.gpg && \
38-
# (apt-key adv --refresh-keys --keyserver hkp://ha.pool.sks-keyservers.net 0xA5D32F012649A5A9 || true) && \
39-
# apt-get update -qq
40-
# RUN apt-get -f install
41-
42-
4335

4436
# Configure git-lfs
45-
RUN apt-get install -y apt-transport-https debian-archive-keyring
46-
RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash && \
47-
apt-get update && \
48-
apt-get install -y git-lfs
37+
# RUN apt-get install -y apt-transport-https debian-archive-keyring
38+
# RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash && \
39+
# apt-get update && \
40+
# apt-get install -y git-lfs
4941

5042
# #---------AFNI INSTALL--------------------------------------------------------#
5143
# # setup of AFNI, which provides robust modifications of many of neuroimaging algorithms
@@ -197,27 +189,22 @@ RUN apt-get update && apt-get -y upgrade insighttoolkit4-python
197189
# setup of python dependencies for m2g itself, as well as file dependencies
198190
RUN \
199191
pip3.7 install --no-cache-dir hyppo==0.1.3 nibabel==2.3.3 scipy==1.4.1 python-dateutil pandas==0.23.4 boto3==1.7.13 awscli==1.15.40 virtualenv
192+
200193
RUN \
201194
pip3.7 install --no-cache-dir matplotlib nilearn sklearn cython vtk pyvtk fury==0.5.1
202195
RUN \
203196
pip3.7 install --no-cache-dir yamlordereddictloader
204-
#got rid of awscli here^
205197
RUN \
198+
206199
pip3.7 install --no-cache-dir requests ipython duecredit graspy==0.3.0 scikit-image networkx dipy==1.1.1 pybids==0.12.0
207200

208201
# TODO: Update pybids
209202
RUN \
210203
pip3.7 install --no-cache-dir plotly==1.12.9 configparser>=3.7.4 regex
211204

212-
213-
RUN \
214-
pip3.7 install s3transfer==0.3.7
215-
216-
RUN \
217-
pip3.7 install setuptools==57.5.0
218205

219206
RUN \
220-
pip3.7 install numba==0.52.0
207+
pip3.7 install s3transfer==0.3.7 setuptools==57.5.0 numba==0.52.0
221208

222209
# install ICA-AROMA
223210
RUN mkdir -p /opt/ICA-AROMA
@@ -276,7 +263,7 @@ RUN pip3.7 install git+https://github.com/ChildMindInstitute/PyPEER.git
276263
RUN mkdir /m2g_atlases
277264

278265
RUN \
279-
git clone https://github.com/neurodata/neuroparc -b remove-lfs && \
266+
git clone https://github.com/neurodata/neuroparc && \
280267
mv /neuroparc/atlases /m2g_atlases && \
281268
rm -rf /neuroparc
282269
RUN chmod -R 777 /m2g_atlases

0 commit comments

Comments
 (0)