Fix

pages/pages_def_home.R

@@ -10,9 +10,9 @@ tabHome = fluidPage(align="left",
                                
                                textInput("imageName", "Image Name", ""),
                                br(),
-                               selectizeInput('fromTemplate', 'From:', choices = c(`ubuntu:16.04` = 'ubuntu:16.04', `rocker/r-base` = 'rocker/r-base'), selected = "ubuntu16", multiple = FALSE),
+                               selectizeInput('fromTemplate', 'From:', choices = c(`ubuntu:16.04` = 'ubuntu:16.04', `r-base` = 'r-base'), selected = "r-base", multiple = FALSE),
                                br(),
-                               radioButtons("containerType", "Container type:", choices = list("Singularity" = "singularity", "Docker" = "docker"), selected = "singularity"),
+                               radioButtons("containerType", "Container type:", choices = list("Singularity" = "singularity", "Docker" = "docker"), selected = "docker"),
                                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 r-base` = 'base', `R from CRAN depo` = 'cran'), selected = "source", multiple = FALSE),

server/opt_home.R

@@ -61,7 +61,7 @@ createEnv <- function(result) {
   if(input$containerType == "singularity") {
       result <- paste(result, "%environment", sep = "\n")
     
-      if(input$rtemplate == "none") {
+      if(input$rtemplate == "none" || input$fromTemplate == "r-base") {
         
       } else if(input$rtemplate == "base") {
         result <- paste(result, "\tR_VERSION=3.2.5", sep = "\n")
@@ -81,7 +81,7 @@ createEnv <- function(result) {
         result <- paste(result, "\texport PATH=/opt/biotools/bin:$PATH", sep = "\n")
       }
   } else {
-      if(input$rtemplate == "none") {
+      if(input$rtemplate == "none" || input$fromTemplate == "r-base") {
         
       } else if(input$rtemplate == "base") {
         result <- paste0(result, "ENV R_VERSION=", Rversion)
@@ -463,7 +463,7 @@ createContentFile <- function() {
   result <- createLabel(result)
   result <- createLibPrePost(result)
 
-  if(input$rtemplate != "none") {
+  if(input$rtemplate != "none" && input$fromTemplate != "r-base") {
     
       haveR = TRUE