Skip to content

Commit 0a41377

Browse files
authored
Merge pull request #597 from neurorepro/dockerfix
Fix certificate issue as indicated in #595
2 parents 288cf57 + f92d725 commit 0a41377

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

Dockerfile

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,21 @@ RUN apt-get update -qq \
3535
&& rm -rf /var/lib/apt/lists/*
3636
COPY [".", \
3737
"/src/heudiconv"]
38-
ENV CONDA_DIR="/opt/miniconda-latest" \
39-
PATH="/opt/miniconda-latest/bin:$PATH"
38+
ENV CONDA_DIR="/opt/miniconda-py39_4.12.0" \
39+
PATH="/opt/miniconda-py39_4.12.0/bin:$PATH"
4040
RUN apt-get update -qq \
4141
&& apt-get install -y -q --no-install-recommends \
4242
bzip2 \
4343
ca-certificates \
4444
curl \
4545
&& rm -rf /var/lib/apt/lists/* \
4646
# Install dependencies.
47-
&& export PATH="/opt/miniconda-latest/bin:$PATH" \
47+
&& export PATH="/opt/miniconda-py39_4.12.0/bin:$PATH" \
4848
&& echo "Downloading Miniconda installer ..." \
4949
&& conda_installer="/tmp/miniconda.sh" \
50-
&& curl -fsSL -o "$conda_installer" https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh \
51-
&& bash "$conda_installer" -b -p /opt/miniconda-latest \
50+
&& curl -fsSL -o "$conda_installer" https://repo.continuum.io/miniconda/Miniconda3-py39_4.12.0-Linux-x86_64.sh \
51+
&& bash "$conda_installer" -b -p /opt/miniconda-py39_4.12.0 \
5252
&& rm -f "$conda_installer" \
53-
&& conda update -yq -nbase conda \
5453
# Prefer packages in conda-forge
5554
&& conda config --system --prepend channels conda-forge \
5655
# Packages in lower-priority channels not considered if a package with the same
@@ -136,14 +135,14 @@ RUN printf '{ \
136135
{ \
137136
"name": "env", \
138137
"kwds": { \
139-
"CONDA_DIR": "/opt/miniconda-latest", \
140-
"PATH": "/opt/miniconda-latest/bin:$PATH" \
138+
"CONDA_DIR": "/opt/miniconda-py39_4.12.0", \
139+
"PATH": "/opt/miniconda-py39_4.12.0/bin:$PATH" \
141140
} \
142141
}, \
143142
{ \
144143
"name": "run", \
145144
"kwds": { \
146-
"command": "apt-get update -qq\\napt-get install -y -q --no-install-recommends \\\\\\n bzip2 \\\\\\n ca-certificates \\\\\\n curl\\nrm -rf /var/lib/apt/lists/*\\n# Install dependencies.\\nexport PATH=\\"/opt/miniconda-latest/bin:$PATH\\"\\necho \\"Downloading Miniconda installer ...\\"\\nconda_installer=\\"/tmp/miniconda.sh\\"\\ncurl -fsSL -o \\"$conda_installer\\" https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh\\nbash \\"$conda_installer\\" -b -p /opt/miniconda-latest\\nrm -f \\"$conda_installer\\"\\nconda update -yq -nbase conda\\n# Prefer packages in conda-forge\\nconda config --system --prepend channels conda-forge\\n# Packages in lower-priority channels not considered if a package with the same\\n# name exists in a higher priority channel. Can dramatically speed up installations.\\n# Conda recommends this as a default\\n# https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/manage-channels.html\\nconda config --set channel_priority strict\\nconda config --system --set auto_update_conda false\\nconda config --system --set show_channel_urls true\\n# Enable `conda activate`\\nconda init bash\\nconda install -y --name base \\\\\\n \\"python=3.9\\" \\\\\\n \\"traits>=4.6.0\\" \\\\\\n \\"scipy\\" \\\\\\n \\"numpy\\" \\\\\\n \\"nomkl\\" \\\\\\n \\"pandas\\"\\nbash -c \\"source activate base\\n python -m pip install --no-cache-dir --editable \\\\\\n \\"/src/heudiconv[all]\\"\\"\\n# Clean up\\nsync && conda clean --all --yes && sync\\nrm -rf ~/.cache/pip/*" \
145+
"command": "apt-get update -qq\\napt-get install -y -q --no-install-recommends \\\\\\n bzip2 \\\\\\n ca-certificates \\\\\\n curl\\nrm -rf /var/lib/apt/lists/*\\n# Install dependencies.\\nexport PATH=\\"/opt/miniconda-py39_4.12.0/bin:$PATH\\"\\necho \\"Downloading Miniconda installer ...\\"\\nconda_installer=\\"/tmp/miniconda.sh\\"\\ncurl -fsSL -o \\"$conda_installer\\" https://repo.continuum.io/miniconda/Miniconda3-py39_4.12.0-Linux-x86_64.sh\\nbash \\"$conda_installer\\" -b -p /opt/miniconda-py39_4.12.0\\nrm -f \\"$conda_installer\\"\\n# Prefer packages in conda-forge\\nconda config --system --prepend channels conda-forge\\n# Packages in lower-priority channels not considered if a package with the same\\n# name exists in a higher priority channel. Can dramatically speed up installations.\\n# Conda recommends this as a default\\n# https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/manage-channels.html\\nconda config --set channel_priority strict\\nconda config --system --set auto_update_conda false\\nconda config --system --set show_channel_urls true\\n# Enable `conda activate`\\nconda init bash\\nconda install -y --name base \\\\\\n \\"python=3.9\\" \\\\\\n \\"traits>=4.6.0\\" \\\\\\n \\"scipy\\" \\\\\\n \\"numpy\\" \\\\\\n \\"nomkl\\" \\\\\\n \\"pandas\\"\\nbash -c \\"source activate base\\n python -m pip install --no-cache-dir --editable \\\\\\n \\"/src/heudiconv[all]\\"\\"\\n# Clean up\\nsync && conda clean --all --yes && sync\\nrm -rf ~/.cache/pip/*" \
147146
} \
148147
}, \
149148
{ \

utils/gen-docker-image.sh

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ docker run --rm $image generate docker -b neurodebian:bullseye -p apt \
1111
--dcm2niix version=v1.0.20220720 method=source \
1212
--install git gcc pigz liblzma-dev libc-dev git-annex-standalone netbase \
1313
--copy . /src/heudiconv \
14-
--miniconda version=latest conda_install="python=3.9 traits>=4.6.0 scipy numpy nomkl pandas" \
14+
--miniconda version="py39_4.12.0" conda_install="python=3.9 traits>=4.6.0 scipy numpy nomkl pandas" \
1515
pip_install="/src/heudiconv[all]" \
1616
pip_opts="--editable" \
1717
--entrypoint "heudiconv" \

0 commit comments

Comments
 (0)