From 60b1b2df559be16163c98c5b75133dfbb3456612 Mon Sep 17 00:00:00 2001 From: Joshua Shapiro Date: Fri, 30 Aug 2024 12:57:51 -0400 Subject: [PATCH] Make dockerfiles more uniform --- analyses/doublet-detection/Dockerfile | 6 +++--- docs/ensuring-repro/docker/docker-images.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/analyses/doublet-detection/Dockerfile b/analyses/doublet-detection/Dockerfile index 7a802b562..c3ba89d3a 100644 --- a/analyses/doublet-detection/Dockerfile +++ b/analyses/doublet-detection/Dockerfile @@ -27,7 +27,7 @@ RUN curl -L "https://github.com/conda-forge/miniforge/releases/latest/download/M && echo ". /opt/conda/etc/profile.d/conda.sh && conda activate base" >> ~/.bashrc # Install conda-lock -RUN conda install --channel=conda-forge --name=base conda-lock +RUN conda install --channel=conda-forge --name=base conda-lock && conda clean --all --yes # Install pandoc dependency RUN apt-get -y update && \ @@ -46,8 +46,8 @@ ENV RENV_CONFIG_CACHE_ENABLED=FALSE COPY conda-lock.yml conda-lock.yml # restore from conda-lock.yml file and clean up to reduce image size -RUN conda-lock install -n ${ENV_NAME} conda-lock.yml && \ - conda clean --all --yes +RUN conda-lock install -n ${ENV_NAME} conda-lock.yml \ + && conda clean --all --yes # Copy the renv.lock file from the host environment to the image COPY renv.lock renv.lock diff --git a/docs/ensuring-repro/docker/docker-images.md b/docs/ensuring-repro/docker/docker-images.md index ec1bec3be..298c17d3b 100644 --- a/docs/ensuring-repro/docker/docker-images.md +++ b/docs/ensuring-repro/docker/docker-images.md @@ -163,7 +163,7 @@ RUN curl -L "https://github.com/conda-forge/miniforge/releases/latest/download/M && echo ". /opt/conda/etc/profile.d/conda.sh && conda activate base" >> ~/.bashrc # Install conda-lock -RUN conda install --channel=conda-forge --name=base conda-lock +RUN conda install --channel=conda-forge --name=base conda-lock && conda clean --all --yes # Install renv RUN Rscript -e "install.packages('renv')" @@ -175,8 +175,8 @@ ENV RENV_CONFIG_CACHE_ENABLED FALSE COPY conda-lock.yml conda-lock.yml # restore from conda-lock.yml file and clean up to reduce image size -RUN conda-lock install -n ${ENV_NAME} conda-lock.yml && \ - conda clean --all --yes +RUN conda-lock install -n ${ENV_NAME} conda-lock.yml \ + && conda clean --all --yes # Copy the renv.lock file from the host environment to the image COPY renv.lock renv.lock