small fixes

DataBiosphere · Dec 5, 2024 · eaa4c56 · eaa4c56
1 parent d7d68e4
commit eaa4c56
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/terra-jupyter-aou/Dockerfile b/terra-jupyter-aou/Dockerfile
@@ -195,10 +195,10 @@ RUN apt-get update && \
         && rm -rf /var/lib/apt/lists/*
 RUN pip install --upgrade pip && pip install --verbose h5py
 
-# RW-8725 INSTALL QIMEE2
-RUN curl -fsSL -o qiime2-2022.8.yml https://data.qiime2.org/distro/core/qiime2-2022.8-py38-linux-conda.yml && \
-    conda env create -n qiime2-2022.8 --file qiime2-2022.8.yml && \
-    rm qiime2-2022.8.yml
+# QIIME 2 2024.5 Amplicon Distribution
+RUN curl -fsSL -o qiime2-2024.5.yml https://data.qiime2.org/distro/amplicon/qiime2-amplicon-2024.5-py39-linux-conda.yml && \
+    conda env create -n qiime2-2024.5 --file qiime2-2024.5.yml && \
+    rm qiime2-2024.5.yml
 
 # Install jellyfish
 RUN mkdir -p /tmp/jellyfish && \

diff --git a/terra-jupyter-gatk/Dockerfile b/terra-jupyter-gatk/Dockerfile
@@ -27,7 +27,9 @@ ENV PIP_USER=false
 # uninstalling packages: https://github.com/conda/conda/issues/10357
 COPY --from=python /etc/terra-docker/requirements.txt /etc/terra-docker/base_requirements.txt
 
-RUN pip install --upgrade -r /etc/terra-docker/base_requirements.txt
+RUN pip install -r /etc/terra-docker/base_requirements.txt
+# See: https://github.com/pypa/setuptools/issues/4483
+RUN pip install "setuptools<71.0.0"
 
 # Install GATK
 ENV GATK_VERSION 4.3.0.0