diff --git a/pages/pages_def_home.R b/pages/pages_def_home.R index ab50d923987f3fdba5cd4e37e578b49dea58738c..08ea62cd5f8d69a98bf7a1ed9eb2143f17eb20d0 100755 --- a/pages/pages_def_home.R +++ b/pages/pages_def_home.R @@ -34,13 +34,13 @@ tabHome = fluidPage(align="left", textInput("imageName", "Image Name", ""), br(), #selectizeInput('fromTemplate', 'From:', choices = c(`ubuntu:16.04` = 'ubuntu:16.04', `r-base` = 'r-base'), selected = "r-base", multiple = FALSE), - selectizeInput('fromTemplate', 'From:', choices = c(`ubuntu:16.04` = 'ubuntu:16.04'), selected = "ubuntu:16.04", multiple = FALSE), + selectizeInput('fromTemplate', 'From:', choices = c(`ubuntu:16.04` = 'ubuntu:16.04', `ubuntu:18.04` = 'ubuntu:18.04', `ubuntu:20.04` = 'ubuntu:20.04'), selected = "ubuntu:20.04", multiple = FALSE), br(), radioButtons("containerType", "Container type:", choices = list("Singularity" = "singularity", "Docker" = "docker"), selected = "singularity"), br(), #selectizeInput('rcranpackagelist', 'R CRAN:', choices = NULL, multiple=TRUE, options = list(maxItems = 30000)), - selectizeInput('rtemplate', 'R origin:', choices = c(`None` = 'none', `R from source 3.4.3` = 'source', `R from source 3.4.4` = 'source2', `R from source 3.5.0` = 'source3', `R from source 3.6.0` = 'source4', `R from r-base` = 'base', `R from CRAN depo` = 'cran'), selected = "none", multiple = FALSE), + selectizeInput('rtemplate', 'R origin:', choices = c(`None` = 'none', `R from source 3.4.3` = 'source', `R from source 3.4.4` = 'source2', `R from source 3.5.0` = 'source3', `R from source 3.6.0` = 'source4', `R from source 4.0.1` = 'source5', `R from r-base` = 'base', `R from CRAN depo` = 'cran'), selected = "none", multiple = FALSE), #selectizeInput('biocontainers', 'BioContainers tools :', choices = getBioconductorPackage(), multiple = TRUE), diff --git a/server/opt_home.R b/server/opt_home.R index 2c7dc4ac946a1c52f68bdde117232a84f8c4f2e2..bcd2b5684c601e1af09a292eb0a9d1f4d1e8bbf7 100755 --- a/server/opt_home.R +++ b/server/opt_home.R @@ -75,6 +75,8 @@ createEnv <- function(result) { Rversion = "3.5.0" }else if(input$rtemplate == "source4") { Rversion = "3.6.0" + }else if(input$rtemplate == "source5") { + Rversion = "4.0.1" } if(input$containerType == "singularity") { @@ -243,7 +245,7 @@ createRSource <- function(result, Rversion) { if(input$containerType == "singularity") { result <- paste(result, '\tcd $HOME', sep = "\n") - result <- paste0(result, '\n\twget https://cran.rstudio.com/src/base/R-3/R-', Rversion, '.tar.gz') + result <- paste0(result, '\n\twget https://cran.rstudio.com/src/base/R-',strsplit(Rversion, "")[[1]][1],'/R-', Rversion, '.tar.gz') result <- paste0(result, '\n\ttar xvf R-', Rversion, '.tar.gz') result <- paste0(result, '\n\tcd R-', Rversion) result <- paste(result, "\t./configure --enable-R-static-lib --with-blas --with-lapack --enable-R-shlib=yes ", sep = "\n") @@ -720,7 +722,7 @@ createContentFile <- function() { haveR = TRUE - if(input$rtemplate == "source" || input$rtemplate == "source2" || input$rtemplate == "source3" || input$rtemplate == "source4") { + if(input$rtemplate == "source" || input$rtemplate == "source2" || input$rtemplate == "source3" || input$rtemplate == "source4" || input$rtemplate == "source5") { Rversion = "3.4.3" if(input$rtemplate == "source2") { Rversion = "3.4.4" @@ -728,8 +730,9 @@ createContentFile <- function() { Rversion = "3.5.0" } else if(input$rtemplate == "source4") { Rversion = "3.6.0" + } else if(input$rtemplate == "source5") { + Rversion = "4.0.1" } - result <- createRSource(result, Rversion) } else if(input$rtemplate == "base") { result <- createRBase(result)