@@ -8,17 +8,20 @@ FROM obiba/rock:2.2.1-R4.5.3
88
99LABEL DataSHIELD=<info@datashield.ac.uk>
1010
11- ENV DSBASE_VERSION=6.3.5
12- ENV DSTIDYVERSE_VERSION=v1.2.1
11+ # Uncomment the following lines to specify versions of dsBase and dsTidyverse to install from GitHub
12+ # ENV DSBASE_VERSION=6.3.5
13+ # ENV DSTIDYVERSE_VERSION=v1.2.1
1314
1415ENV ROCK_LIB=/var/lib/rock/R/library
1516
1617RUN \
1718 # Additional system dependencies
1819 apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y cmake && \
1920 # Update R packages
20- # Rscript -e "update.packages(ask = FALSE, repos = c('https://cloud.r-project.org'), instlib = '/usr/local/lib/R/site-library')" && \
21+ # Rscript -e "update.packages(ask = FALSE, repos = c('https://cloud.r-project.org'), instlib = '/usr/local/lib/R/site-library')" && \
2122 # Install new R packages
22- Rscript -e "remotes::install_github('molgenis/ds-tidyverse', ref = '$DSTIDYVERSE_VERSION', repos = c('https://cloud.r-project.org', 'https://cran.datashield.org'), dependencies = TRUE, upgrade = FALSE, lib = '$ROCK_LIB')" && \
23- Rscript -e "remotes::install_github('datashield/dsBase', ref = '$DSBASE_VERSION', repos = c('https://cloud.r-project.org', 'https://cran.datashield.org'), dependencies = TRUE, upgrade = FALSE, lib = '$ROCK_LIB')" && \
23+ Rscript -e "install.packages(c('dsBase', 'dsTidyverse'), repos = c('https://cloud.r-project.org'), dependencies = TRUE, upgrade = FALSE, lib = '$ROCK_LIB')" && \
24+ # Uncomment the following lines to install specific versions of dsBase and dsTidyverse from GitHub
25+ # Rscript -e "remotes::install_github('molgenis/ds-tidyverse', ref = '$DSTIDYVERSE_VERSION', repos = c('https://cloud.r-project.org', 'https://cran.datashield.org'), dependencies = TRUE, upgrade = FALSE, lib = '$ROCK_LIB')" && \
26+ # Rscript -e "remotes::install_github('datashield/dsBase', ref = '$DSBASE_VERSION', repos = c('https://cloud.r-project.org', 'https://cran.datashield.org'), dependencies = TRUE, upgrade = FALSE, lib = '$ROCK_LIB')" && \
2427 chown -R rock $ROCK_LIB
0 commit comments