Skip to content

Commit 174c541

Browse files
authored
Merge pull request #773 from effigies/fix/docker_build
MNT: Try bumping docker base to latest nipreps/miniconda
2 parents ba6162e + 5c57bfa commit 174c541

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

.circleci/config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,8 @@ jobs:
210210
- restore_cache:
211211
keys:
212212
- data-v3-{{ .Branch }}-{{ epoch }}
213+
- data-v3-{{ .Branch }}-
214+
- data-v3-master-
213215

214216
- run:
215217
name: Run unit tests

Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2323
# SOFTWARE.
2424

25-
FROM nipreps/miniconda:py39_2205.0
25+
FROM nipreps/miniconda:py39_2209.01
2626

2727
ARG DEBIAN_FRONTEND=noninteractive
2828
ENV LD_LIBRARY_PATH="/usr/lib/x86_64-linux-gnu:${CONDA_PATH}/lib"
@@ -73,15 +73,16 @@ ENV PATH="${AFNI_DIR}:$PATH" \
7373
RUN ${CONDA_PATH}/bin/conda install -c conda-forge -c anaconda \
7474
gsl \
7575
xorg-libxp \
76-
scipy=1.8 \
77-
&& ${CONDA_PATH}/bin/conda install -c sssdgc png \
7876
&& sync \
7977
&& ${CONDA_PATH}/bin/conda clean -afy; sync \
8078
&& rm -rf ~/.conda ~/.cache/pip/*; sync \
8179
&& ln -s ${CONDA_PATH}/lib/libgsl.so.25 /usr/lib/x86_64-linux-gnu/libgsl.so.19 \
8280
&& ln -s ${CONDA_PATH}/lib/libgsl.so.25 /usr/lib/x86_64-linux-gnu/libgsl.so.0 \
8381
&& ldconfig
8482

83+
RUN GNUPGHOME=/tmp gpg --keyserver hkps://keyserver.ubuntu.com --no-default-keyring --keyring /usr/share/keyrings/linuxuprising.gpg --recv 0xEA8CACC073C3DB2A \
84+
&& echo "deb [signed-by=/usr/share/keyrings/linuxuprising.gpg] https://ppa.launchpadcontent.net/linuxuprising/libpng12/ubuntu focal main" > /etc/apt/sources.list.d/linuxuprising.list
85+
8586
RUN apt-get update \
8687
&& apt-get install -y -q --no-install-recommends \
8788
libcurl4-openssl-dev \
@@ -91,6 +92,7 @@ RUN apt-get update \
9192
libglw1-mesa \
9293
libgomp1 \
9394
libjpeg62 \
95+
libpng12-0 \
9496
libnode-dev \
9597
libssl-dev \
9698
libudunits2-dev \

0 commit comments

Comments
 (0)