From 0bdb31fb65a800fce68e0c718e64710e23f3dd27 Mon Sep 17 00:00:00 2001 From: Rachel Wegener Date: Thu, 16 May 2024 10:13:30 -0400 Subject: [PATCH 1/3] install packages from install.R --- Dockerfile | 3 +++ install.R | 0 2 files changed, 3 insertions(+) create mode 100644 install.R diff --git a/Dockerfile b/Dockerfile index 3d2703d..c496de1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -66,6 +66,9 @@ RUN echo "Checking for 'conda-linux-64.lock' or 'environment.yml'..." \ find ${NB_PYTHON_PREFIX}/lib/python*/site-packages/bokeh/server/static -follow -type f -name '*.js' ! -name '*.min.js' -delete \ ; fi +## Run an install.R script, if it exists. +RUN if [ -f install.R ]; then R --quiet -f install.R; fi + RUN pip install jupyter-rsession-proxy WORKDIR ${HOME} diff --git a/install.R b/install.R new file mode 100644 index 0000000..e69de29 From 5f30a7ea2d72f1f09561dac1fc49bd91de59f914 Mon Sep 17 00:00:00 2001 From: Rachel Wegener Date: Thu, 16 May 2024 10:13:53 -0400 Subject: [PATCH 2/3] add spatialEco and lidR --- install.R | 2 ++ 1 file changed, 2 insertions(+) diff --git a/install.R b/install.R index e69de29..a9c0990 100644 --- a/install.R +++ b/install.R @@ -0,0 +1,2 @@ +install.packages("spatialEco") +install.packages("lidR") From 57adeeb1f9e94d5c29869076d60ed0ceb7b19861 Mon Sep 17 00:00:00 2001 From: Rachel Wegener Date: Thu, 16 May 2024 10:21:39 -0400 Subject: [PATCH 3/3] trigger github actions if install.R gets changed --- .github/workflows/build.yml | 1 + .github/workflows/test.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e1bb8c9..b9fafa3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,6 +7,7 @@ on: paths: - 'conda-linux-64.lock' - 'environment.yml' + - 'install.R' - 'Dockerfile' # Trigger rebuilds if the build process changes - '.github/workflows/build.yaml' diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b624a34..e45e3bb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,6 +4,7 @@ on: pull_request: paths: - 'environment.yml' + - 'install.R' # Trigger rebuilds if the test process changes - '.github/workflows/test.yaml'