Skip to content

Commit

Permalink
Prepare for new Container
Browse files Browse the repository at this point in the history
  • Loading branch information
sneumann committed Mar 2, 2024
1 parent 4178ca6 commit 19c9fe2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 13 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#FROM sneumann/metfamily-base:latest
FROM sneumann/metfamily-base:4.3.2
#FROM sneumann/metfamily-base:4.3.2
#FROM sneumann/metfamily-base:4.0.5
#FROM sneumann/metfamily-base:3.6.3
FROM sneumann/metfamily-base:3.6.3

MAINTAINER Steffen Neumann <[email protected]>

Expand Down
6 changes: 1 addition & 5 deletions inst/MetFamily/server.R
Original file line number Diff line number Diff line change
Expand Up @@ -443,16 +443,12 @@ shinyServer(
## about page
output$rInfo <- renderText({
print(paste("init rInfo"))
#paste(R.Version()$version.string, "\nwd: ", getwd(), sep = "")
paste(
R.Version()$version.string,
"\nMetFamily build: ", metFamilyBuilt, "-", system(command = "hostname", intern = TRUE),
"\nMetFamily build: ", metFamilyAppVersion, "-", system(command = "hostname", intern = TRUE),
"\nMetFamily package: ", packageVersion,
#"\n", getwd(),
#"\n", paste(list.files(path = getwd(), all.files = F, full.names = F, recursive = T, include.dirs = F), collapse = "\n"),
sep = ""
)
#R.Version()$version.string
})
output$ipbImage <- renderImage({
file <- getFile("logo_ipb_en.png")
Expand Down
9 changes: 3 additions & 6 deletions inst/MetFamily/version.R
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
## MetFamily properties

toolName <- "MetFamily"
toolVersion <- "1.0"
metFamilyBuilt <- "1.3.2"
metFamilyAppVersion <- "1.3.3"

if ("MetFamily" %in% rownames(installed.packages())) {
packageVersion <- package.version("MetFamily")
} else {
packageVersion <- "not packaged"
}
packageVersion <- package.version("MetFamily")



0 comments on commit 19c9fe2

Please sign in to comment.