Skip to content

Commit

Permalink
Merge pull request #92 from nmfs-opensci/eeholmes-dev-1
Browse files Browse the repository at this point in the history
Update appendix
  • Loading branch information
eeholmes authored Oct 25, 2024
2 parents 764fa9d + 9f9cb52 commit 67567f5
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions appendix
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ ENV CONDA_ENV=notebook
# Install R, RStudio via Rocker scripts
ENV R_VERSION="4.4.1"
ENV R_DOCKERFILE="verse_${R_VERSION}"
# This is in the rocker script but will not run since ${NB_USER} already exists
# Needed because rocker scripts set permissions based on the staff group
RUN usermod -a -G staff "${NB_USER}"
RUN PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin && \
chmod +x ${REPO_DIR}/rocker.sh && \
${REPO_DIR}/rocker.sh
Expand Down Expand Up @@ -57,9 +60,7 @@ ONBUILD RUN echo "Checking for 'conda-lock.yml' or 'environment.yml'..." \
; if test -f "conda-lock.yml" ; then echo "Using conda-lock.yml" & \
conda-lock install --name ${CONDA_ENV} \
; elif test -f "environment.yml" ; then echo "Using environment.yml" & \
mamba env create --name ${CONDA_ENV} -f environment.yml \
; else echo "No conda-lock.yml or environment.yml! *creating default env*" ; \
mamba create --name ${CONDA_ENV} pangeo-notebook \
mamba env update --name ${CONDA_ENV} -f environment.yml \
; fi \
&& mamba clean -yaf \
&& find ${CONDA_DIR} -follow -type f -name '*.a' -delete \
Expand Down

0 comments on commit 67567f5

Please sign in to comment.