Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
jlopez
RPACIB
Commits
62c25b9c
Commit
62c25b9c
authored
May 09, 2018
by
jlopez
Browse files
Fix
parent
269b0bdb
Changes
2
Hide whitespace changes
Inline
Side-by-side
pages/pages_def_home.R
View file @
62c25b9c
...
...
@@ -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
View file @
62c25b9c
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment