Skip to content

Landing page #16

Merged
merged 6 commits into from
Jun 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions wilson-basic/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion wilson-basic/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 / && \
Expand Down
4 changes: 2 additions & 2 deletions wilson-basic/app.R
Original file line number Diff line number Diff line change
Expand Up @@ -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"))

#
Expand Down