Skip to content

Commit

Permalink
Merge pull request #174 from nmfs-opensci/eeholmes-patch-1
Browse files Browse the repository at this point in the history
test install conda - install R - install conda
  • Loading branch information
eeholmes authored Nov 14, 2024
2 parents d6c3fe9 + cf1cdc6 commit 3cb7346
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
3 changes: 3 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ RUN PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin && \
chmod +x ${REPO_DIR}/rocker.sh && \
${REPO_DIR}/rocker.sh

# Install test conda packages
RUN /pyrocket_scripts/install-conda-packages.sh ${REPO_DIR}/test.yml

# Install extra apt packages
# Install linux packages after R installation since the R install scripts get rid of packages
RUN /pyrocket_scripts/install-apt-packages.sh ${REPO_DIR}/apt.txt
Expand Down
9 changes: 9 additions & 0 deletions test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name: test

channels:
- conda-forge
- nodefaults

dependencies:
- cmocean

0 comments on commit 3cb7346

Please sign in to comment.