Skip to content

Commit

Permalink
Merge pull request #9 from shaneknapp/debug-qiime2
Browse files Browse the repository at this point in the history
reinstalling the qiime2 python env
  • Loading branch information
shaneknapp authored Oct 7, 2024
2 parents 38ac3cf + ec8135e commit e49b780
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
16 changes: 12 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ RUN apt-get update -qq --yes && \
COPY install-mambaforge.bash /tmp/install-mambaforge.bash
RUN chmod 777 /tmp/install-mambaforge.bash
RUN /tmp/install-mambaforge.bash
RUN rm /tmp/install-mambaforge.bash

USER ${NB_USER}

Expand All @@ -165,6 +166,8 @@ RUN mamba env update -p ${CONDA_DIR} -f /tmp/environment.yml && \
mamba clean -afy

USER root
RUN rm /tmp/environment.yml /tmp/infra-requirements.txt

ENV PLAYWRIGHT_BROWSERS_PATH ${CONDA_DIR}
RUN playwright install-deps
RUN chown -Rh jovyan:jovyan /srv/conda
Expand All @@ -175,10 +178,6 @@ USER ${NB_USER}
ENV PLAYWRIGHT_BROWSERS_PATH ${CONDA_DIR}
RUN playwright install chromium

# 2024-01-13 sknapp: incompatible due to notebook 7
# RUN jupyter contrib nbextensions install --sys-prefix --symlink && \
# jupyter nbextensions_configurator enable --sys-prefix

# Set CRAN mirror to rspm before we install anything
COPY Rprofile.site /usr/lib/R/etc/Rprofile.site
# RStudio needs its own config
Expand All @@ -198,15 +197,24 @@ RUN r /tmp/install.R && \
rm -rf /tmp/downloaded_packages/ /tmp/*.rds

# install bio1b packages
USER ${NB_USER}
COPY bio1b-packages.bash /tmp/bio1b-packages.bash
RUN bash /tmp/bio1b-packages.bash
USER root
RUN rm /tmp/bio1b-packages.bash

# install ib134L packages
USER ${NB_USER}
COPY ib134-packages.bash /tmp/ib134-packages.bash
RUN bash /tmp/ib134-packages.bash
USER root
RUN rm /tmp/ib134-packages.bash

# install ccb293 packages
USER ${NB_USER}
COPY ccb293-packages.bash /tmp/ccb293-packages.bash
RUN bash /tmp/ccb293-packages.bash
USER root
RUN rm /tmp/ccb293-packages.bash

ENTRYPOINT ["tini", "--"]
3 changes: 3 additions & 0 deletions ccb293-packages.bash
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#! /bin/bash
# Install QIIME2 for CCB293
# https://github.com/berkeley-dsep-infra/datahub/issues/1699
set -ex

wget https://data.qiime2.org/distro/core/qiime2-2021.8-py38-linux-conda.yml
mamba env create -n qiime2 --file qiime2-2021.8-py38-linux-conda.yml && mamba clean -afy
rm qiime2-2021.8-py38-linux-conda.yml

0 comments on commit e49b780

Please sign in to comment.