Merge pull request #16 from loosolab/landing-page

Landing page
loosolab · Jun 28, 2022 · f896a0a41e14e098b774db5efe57784b4c237c0e · f896a0a
2 parents b14c7e6 + e2047d2
commit f896a0a41e14e098b774db5efe57784b4c237c0e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/wilson-basic/CHANGELOG.md b/wilson-basic/CHANGELOG.md
@@ -1,5 +1,9 @@
 # WIlsON Basic App Changelog
 
+## 2.1.4
+
+- add 'markdown' dependency
+
 ## 2.1.3
 
 - removed wrong returns which caused the app to crash

diff --git a/wilson-basic/Dockerfile b/wilson-basic/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update && apt-get install -y \
     # Install R infrastructure
     R -e "install.packages(c('BiocManager', 'webshot'), repos = c(CRAN = 'https://cloud.r-project.org/'))" && \
     R -e "webshot::install_phantomjs()" && \
-    R -e "BiocManager::install(c('shinyBS', 'shinydashboard', 'shinythemes', 'htmltools', 'wilson'))" && \
+    R -e "BiocManager::install(c('shinyBS', 'shinydashboard', 'shinythemes', 'htmltools', 'wilson', 'markdown', 'pacman'))" && \
     cp /root/bin/phantomjs /usr/local/bin && \
     # Move entrypoint, create log directory
     mv /srv/shiny-server/entrypoint.sh / && \

diff --git a/wilson-basic/app.R b/wilson-basic/app.R
@@ -4,15 +4,15 @@
 #
 
 # Check and Load dependencies
-dependencies <- c("wilson", "shiny", "shinydashboard", "shinythemes", "shinyBS", "shinyjs", "log4r")
+dependencies <- c("wilson", "shiny", "shinydashboard", "shinythemes", "shinyBS", "shinyjs", "log4r", "markdown")
 
 if (!requireNamespace("pacman", quietly = TRUE)) {
   install.packages("pacman")
 }
 pacman::p_load(char = dependencies)
 
 # Set versions
-wilson_app_version <- "WIlsON basic 2.1.3"
+wilson_app_version <- "WIlsON basic 2.1.4"
 wilson_package_version <- as.character(packageVersion("wilson"))
 
 #