Skip to content

Commit c8eb353

Browse files
committed
fix: docker build warnings
1 parent 3b4d6e9 commit c8eb353

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

Dockerfile

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ COPY . /src
3232
RUN uvx --from build pyproject-build --installer uv -w /src
3333

3434
# Older Python to support legacy MCRIBS
35-
FROM python:3.6.15-slim as pyenv
35+
FROM python:3.6.15-slim AS pyenv
3636
RUN pip install --no-cache-dir numpy nibabel scipy pandas numexpr contextlib2 \
3737
&& cp /usr/lib/x86_64-linux-gnu/libffi.so.7* /usr/local/lib
3838

3939
# Intermediate step with utilities for downloading packages
40-
FROM ${BASE_IMAGE} as downloader
40+
FROM ${BASE_IMAGE} AS downloader
4141
RUN apt-get update && \
4242
apt-get install -y --no-install-recommends \
4343
binutils \
@@ -48,7 +48,7 @@ RUN apt-get update && \
4848
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
4949

5050
# AFNI
51-
FROM downloader as afni
51+
FROM downloader AS afni
5252
# The download link can point to newer releases
5353
# As a safeguard, take advantage of Docker caching, and
5454
# Bump the date to current to update AFNI
@@ -71,7 +71,7 @@ RUN mkdir -p /opt/afni-latest \
7171
-name "3dvolreg" \) -delete
7272

7373
# Micromamba
74-
FROM downloader as micromamba
74+
FROM downloader AS micromamba
7575

7676
# Install a C compiler to build extensions when needed.
7777
# traits<6.4 wheels are not available for Python 3.11+, but build easily.
@@ -95,7 +95,7 @@ RUN npm install -g svgo@^3.2.0 [email protected] && \
9595
rm -r ~/.npm
9696

9797
# Main container
98-
FROM ${BASE_IMAGE} as nibabies
98+
FROM ${BASE_IMAGE} AS nibabies
9999
ENV DEBIAN_FRONTEND="noninteractive" \
100100
LANG="en_US.UTF-8" \
101101
LC_ALL="en_US.UTF-8"
@@ -179,7 +179,6 @@ ENV SUBJECTS_DIR="$FREESURFER_HOME/subjects" \
179179
MINC_BIN_DIR="$FREESURFER_HOME/mni/bin" \
180180
MINC_LIB_DIR="$FREESURFER_HOME/mni/lib" \
181181
MNI_DATAPATH="$FREESURFER_HOME/mni/data" \
182-
FSL_DIR=${FSLDIR} \
183182
FREESURFER="/opt/freesurfer"
184183
ENV PERL5LIB="$MINC_LIB_DIR/perl5/5.8.5" \
185184
MNI_PERL5LIB="$MINC_LIB_DIR/perl5/5.8.5" \
@@ -191,7 +190,7 @@ COPY --from=pyenv /usr/local/lib/ /usr/local/lib/
191190
ENV PATH="/opt/MCRIBS/bin:/opt/MCRIBS/MIRTK/MIRTK-install/bin:/opt/MCRIBS/MIRTK/MIRTK-install/lib/tools:${PATH}" \
192191
LD_LIBRARY_PATH="/opt/MCRIBS/lib:/opt/MCRIBS/ITK/ITK-install/lib:/opt/MCRIBS/VTK/VTK-install/lib:/opt/MCRIBS/MIRTK/MIRTK-install/lib:/usr/local/lib:${LD_LIBRARY_PATH}" \
193192
MCRIBS_HOME="/opt/MCRIBS" \
194-
PYTHONPATH="/opt/MCRIBS/lib/python:$PYTHONPATH"
193+
PYTHONPATH="/opt/MCRIBS/lib/python"
195194

196195
# Create a shared $HOME directory
197196
RUN useradd -m -s /bin/bash -G users nibabies && chmod -R 777 /home/nibabies
@@ -205,8 +204,8 @@ ENV MAMBA_ROOT_PREFIX="/opt/conda"
205204
RUN micromamba shell init -s bash && \
206205
echo "micromamba activate nibabies" >> $HOME/.bashrc
207206
ENV PATH="/opt/conda/envs/nibabies/bin:$PATH" \
208-
CPATH="/opt/conda/envs/nibabies/include:$CPATH" \
209-
LD_LIBRARY_PATH="/opt/conda/envs/nibabies/lib:$LD_LIBRARY_PATH" \
207+
CPATH="/opt/conda/envs/nibabies/include" \
208+
LD_LIBRARY_PATH="/opt/conda/envs/nibabies/lib" \
210209
CONDA_PYTHON="/opt/conda/envs/nibabies/bin/python"
211210

212211
# FSL environment

0 commit comments

Comments
 (0)