fix docker.sh to use R 4.1 (PecanProject#2891)

* fix docker.sh to use R 4.1 * install roxygen from CRAN (wrong version on R 4.0) Co-authored-by: Chris Black <[email protected]>
hangyakuzero · Nov 9, 2021 · a53ac27 · a53ac27
1 parent a316f9c
commit a53ac27
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/docker.sh b/docker.sh
@@ -11,7 +11,7 @@ cd $(dirname $0)
 # Can set the following variables
 DEBUG=${DEBUG:-""}
 DEPEND=${DEPEND:-""}
-R_VERSION=${R_VERSION:-"4.0.2"}
+R_VERSION=${R_VERSION:-"4.1"}
 
 # --------------------------------------------------------------------------------
 # PECAN BUILD SECTION

diff --git a/docker/depends/Dockerfile b/docker/depends/Dockerfile
@@ -40,7 +40,7 @@ RUN apt-get update \
 # ----------------------------------------------------------------------
 COPY pecan.depends.R /
 RUN  Rscript -e "install.packages(c('devtools'))" \
-  && Rscript -e "devtools::install_version('roxygen2', '7.1.2')" \
+  && Rscript -e "devtools::install_version('roxygen2', '7.1.2', repos = 'cran.r-project.org')" \
   && R_LIBS_USER='/usr/local/lib/R/site-library' Rscript /pecan.depends.R \
   && rm -rf /tmp/*