Skip to content

Commit 459a878

Browse files
committed
📦 Update variant bases
[rebuild Ubuntu.bionic-non-free] [rebuild Ubuntu.xenial-20200114] Ref #1911
1 parent cc90131 commit 459a878

File tree

3 files changed

+43
-10
lines changed

3 files changed

+43
-10
lines changed

.github/Dockerfiles/Ubuntu.bionic-non-free.Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,18 +121,18 @@ RUN groupadd -r c-pac && \
121121
ENV PATH=/usr/bin/nvm/versions/node/v12.12.0/bin:/usr/local/miniconda/bin:$PATH
122122

123123
# Installing conda dependencies, torch & Python dependencies
124-
COPY requirements.txt /opt/requirements.txt
125-
RUN conda update conda -y && \
126-
conda install nomkl && \
127-
conda install -y \
124+
COPY dev/docker_data/unpinned_requirements.txt /opt/requirements.txt
125+
RUN conda install -n base conda-forge::mamba conda-forge::libarchive==3.5.2 -y && \
126+
mamba update conda -y && \
127+
mamba install nomkl -y && \
128+
mamba install -y \
128129
blas \
129130
cython \
130131
matplotlib==3.1.3 \
131132
networkx==2.4 \
132133
nose==1.3.7 \
133134
numpy==1.16.4 \
134135
pandas==1.0.5 \
135-
scipy==1.6.3 \
136136
traits==4.6.0 \
137137
pip && \
138138
pip install \

.github/Dockerfiles/Ubuntu.xenial-20200114.Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,25 +133,25 @@ ENV PATH="/usr/local/miniconda/bin:$PATH" \
133133
PYTHONNOUSERSITE=1
134134

135135
# install conda dependencies
136-
RUN conda update conda -y && \
137-
conda install nomkl && \
138-
conda install -y \
136+
RUN conda install -n base conda-forge::mamba conda-forge::libarchive==3.5.2 -y && \
137+
mamba update conda -y && \
138+
mamba install nomkl -y && \
139+
mamba install -y \
139140
blas \
140141
cython \
141142
matplotlib==2.2.2 \
142143
networkx==2.4 \
143144
nose==1.3.7 \
144145
numpy==1.15.4 \
145146
pandas==1.0.5 \
146-
scipy==1.6.3 \
147147
traits==4.6.0 \
148148
pip
149149

150150
# install torch
151151
RUN pip install torch==1.2.0 torchvision==0.4.0 -f https://download.pytorch.org/whl/torch_stable.html
152152

153153
# install python dependencies
154-
COPY requirements.txt /opt/requirements.txt
154+
COPY dev/docker_data/unpinned_requirements.txt /opt/requirements.txt
155155
RUN pip install --upgrade setuptools
156156
RUN pip install --upgrade pip
157157
RUN pip install -r /opt/requirements.txt
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
boto3
2+
ciftify
3+
click
4+
configparser
5+
future
6+
INDI-Tools @ git+https://[email protected]/FCP-INDI/INDI-Tools.git@998c246c597209f06f8d5c5b92ddc2c9c1942f46
7+
joblib
8+
lockfile
9+
matplotlib
10+
networkx
11+
nibabel
12+
nilearn
13+
nipype
14+
nose
15+
numpy
16+
pandas
17+
pathvalidate
18+
patsy
19+
prov
20+
psutil
21+
PyBASC
22+
pybids
23+
PyPEER @ git+https://[email protected]/ChildMindInstitute/PyPEER.git@6965d2b2bea0fef824e885fec33a8e0e6bd50a97
24+
python-dateutil
25+
PyYAML
26+
requests
27+
scikit-learn
28+
scipy
29+
sdcflows
30+
torch
31+
torchvision
32+
traits
33+
voluptuous

0 commit comments

Comments
 (0)