From 4e9642a7a3f5faa5231b2fb9d2b32b71b94415f6 Mon Sep 17 00:00:00 2001 From: Hendrik Schultheis Date: Tue, 28 Jun 2022 09:00:15 +0200 Subject: [PATCH 1/6] Revert "change landing page to feature selection; up label to 2.1.3" This reverts commit cbc9ed07d1d97d5e020dbf048120441e35c5be25. --- wilson-basic/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wilson-basic/Dockerfile b/wilson-basic/Dockerfile index 3563ec7..0a12321 100644 --- a/wilson-basic/Dockerfile +++ b/wilson-basic/Dockerfile @@ -2,7 +2,7 @@ FROM rocker/shiny:latest LABEL maintainer="Jens Preussner " LABEL maintainer="Hendrik Schultheis " LABEL maintainer="Carsten Kuenne " -LABEL version="2.1.3" +LABEL version="2.1.2" # # Configuration @@ -11,7 +11,7 @@ ENV \ # Define the default location from which the app is served WILSON_LOCATION=/ \ # Define the landing page for the app - WILSON_LANDING_PAGE=feature_selection + WILSON_LANDING_PAGE=introduction # # Move app and data to container From b151c6d62f3094e5271f0fcb07b6aa7feccd307b Mon Sep 17 00:00:00 2001 From: Hendrik Schultheis Date: Tue, 28 Jun 2022 10:05:24 +0200 Subject: [PATCH 2/6] update dependencies --- wilson-basic/Dockerfile | 2 +- wilson-basic/app.R | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wilson-basic/Dockerfile b/wilson-basic/Dockerfile index 0a12321..1540eb7 100644 --- 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 index 79dfb7c..ceef498 100755 --- a/wilson-basic/app.R +++ b/wilson-basic/app.R @@ -4,7 +4,7 @@ # # 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") From 8defe2f25f09ad9a6c88e9f111ae8490a40a45bb Mon Sep 17 00:00:00 2001 From: Hendrik Schultheis Date: Tue, 28 Jun 2022 10:06:22 +0200 Subject: [PATCH 3/6] up app version --- wilson-basic/app.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wilson-basic/app.R b/wilson-basic/app.R index ceef498..301cabd 100755 --- a/wilson-basic/app.R +++ b/wilson-basic/app.R @@ -12,7 +12,7 @@ if (!requireNamespace("pacman", quietly = TRUE)) { 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")) # From 16d94871e4a222e1f3421602a1c7af274543b699 Mon Sep 17 00:00:00 2001 From: Hendrik Schultheis Date: Tue, 28 Jun 2022 10:07:11 +0200 Subject: [PATCH 4/6] change landing page to feature selection --- wilson-basic/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wilson-basic/Dockerfile b/wilson-basic/Dockerfile index 1540eb7..69ad4e8 100644 --- a/wilson-basic/Dockerfile +++ b/wilson-basic/Dockerfile @@ -11,7 +11,7 @@ ENV \ # Define the default location from which the app is served WILSON_LOCATION=/ \ # Define the landing page for the app - WILSON_LANDING_PAGE=introduction + WILSON_LANDING_PAGE=feature_selection # # Move app and data to container From d8454ebf6527bc5c6e4b44604ceafdf00bd78575 Mon Sep 17 00:00:00 2001 From: Hendrik Schultheis Date: Tue, 28 Jun 2022 10:08:00 +0200 Subject: [PATCH 5/6] up dockerfile version --- wilson-basic/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wilson-basic/Dockerfile b/wilson-basic/Dockerfile index 69ad4e8..3931a33 100644 --- a/wilson-basic/Dockerfile +++ b/wilson-basic/Dockerfile @@ -2,7 +2,7 @@ FROM rocker/shiny:latest LABEL maintainer="Jens Preussner " LABEL maintainer="Hendrik Schultheis " LABEL maintainer="Carsten Kuenne " -LABEL version="2.1.2" +LABEL version="2.1.3" # # Configuration From e2047d20e7de9edb3aec7c89b54b7cecf195cb7d Mon Sep 17 00:00:00 2001 From: Hendrik Schultheis Date: Tue, 28 Jun 2022 10:09:10 +0200 Subject: [PATCH 6/6] update changelog --- wilson-basic/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wilson-basic/CHANGELOG.md b/wilson-basic/CHANGELOG.md index 13149bc..02bb681 100644 --- 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