Skip to content

Commit

Permalink
Update Conda to 24.11.1 to fix Docker build failure and small improve…
Browse files Browse the repository at this point in the history
…ments to the Dockerfile.

PiperOrigin-RevId: 707479885
Change-Id: Ic3c71229bcf3a935cae86aee64ee7c02220e1085
  • Loading branch information
Augustin-Zidek authored and copybara-github committed Dec 18, 2024
1 parent bbd8300 commit 6350ddd
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
15 changes: 8 additions & 7 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ ARG CUDA
# Use bash to support string substitution.
SHELL ["/bin/bash", "-o", "pipefail", "-c"]

ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update --quiet \
&& DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --yes --quiet \
&& apt-get install --no-install-recommends --yes --quiet \
build-essential \
cmake \
cuda-command-line-tools-$(cut -f1,2 -d- <<< ${CUDA//./-}) \
Expand All @@ -36,11 +37,11 @@ RUN apt-get update --quiet \
&& apt-get clean

# Compile HHsuite from source.
RUN git clone --branch v3.3.0 https://github.com/soedinglab/hh-suite.git /tmp/hh-suite \
RUN git clone --branch v3.3.0 --single-branch https://github.com/soedinglab/hh-suite.git /tmp/hh-suite \
&& mkdir /tmp/hh-suite/build \
&& pushd /tmp/hh-suite/build \
&& cmake -DCMAKE_INSTALL_PREFIX=/opt/hhsuite .. \
&& make -j 4 && make install \
&& make --jobs 4 && make install \
&& ln -s /opt/hhsuite/bin/* /usr/bin \
&& popd \
&& rm -rf /tmp/hh-suite
Expand All @@ -51,12 +52,12 @@ RUN wget -q -P /tmp \
&& bash /tmp/Miniconda3-latest-Linux-x86_64.sh -b -p /opt/conda \
&& rm /tmp/Miniconda3-latest-Linux-x86_64.sh

# Install conda packages.
# Install Conda packages.
ENV PATH="/opt/conda/bin:$PATH"
ENV LD_LIBRARY_PATH="/opt/conda/lib:$LD_LIBRARY_PATH"
RUN conda install -qy conda==24.1.2 pip python=3.11 \
&& conda install -y -c nvidia cuda=${CUDA_VERSION} \
&& conda install -y -c conda-forge openmm=8.0.0 pdbfixer \
RUN conda install --quiet --yes conda==24.11.1 pip python=3.11 \
&& conda install --quiet --yes --channel nvidia cuda=${CUDA_VERSION} \
&& conda install --quiet --yes --channel conda-forge openmm=8.0.0 pdbfixer \
&& conda clean --all --force-pkgs-dirs --yes

COPY . /app/alphafold
Expand Down
2 changes: 1 addition & 1 deletion notebooks/AlphaFold.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
"\n",
" PATH=%env PATH\n",
" %env PATH=/opt/conda/bin:{PATH}\n",
" %shell conda install -qy conda==24.1.2 \\\n",
" %shell conda install -qy conda==24.11.1 \\\n",
" \u0026\u0026 conda install -qy -c conda-forge \\\n",
" python=3.10 \\\n",
" openmm=8.0.0 \\\n",
Expand Down

0 comments on commit 6350ddd

Please sign in to comment.