Merge pull request #59 from abkfenris/RProfile

Use Rprofile.site
oceanhackweek · Aug 16, 2022 · f743e9d · f743e9d
2 parents 0ee900a + 88e0ecb
commit f743e9d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/r/Dockerfile b/r/Dockerfile
@@ -92,13 +92,11 @@ RUN Rscript -e "remotes::install_cran('assertthat', dependencies=FALSE, upgrade_
     Rscript -e "remotes::install_github('kwstat/pals', dependencies=FALSE, upgrade_dependencies=FALSE, upgrade=FALSE)"
 
 COPY CONDARC ./.condarc
+COPY Rprofile.site /opt/conda/lib/R/etc/
 
 ENV PATH /usr/lib/rstudio-server/bin/:${PATH}
 
 ENV LD_LIBRARY_PATH=${CONDA_DIR}/lib
-ENV PROJ_LIB=${CONDA_DIR}/share/proj
-ENV GDAL_DATA=${CONDA_DIR}/share/gdal
-ENV GDAL_DRIVER_PATH=${CONDA_DIR}/lib/gdalplugins
 
 # USER root
 # RUN chown -R jovyan ${CONDA_DIR}

diff --git a/r/Rprofile.site b/r/Rprofile.site
@@ -0,0 +1,5 @@
+local({
+    Sys.setenv(PROJ_LIB="/opt/conda/share/proj")
+    Sys.setenv(GDAL_DATA="/opt/conda/share/gdal")
+    Sys.setenv(GDAL_DRIVER_PATH="/opt/conda/lib/gdalplugins")
+})