Make dockerfiles more uniform

AlexsLemonade · Aug 30, 2024 · 60b1b2d · 60b1b2d
1 parent b52bcab
commit 60b1b2d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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