Skip to content

Commit

Permalink
Merge branch 'app_finalize' of github.com:omnideconv/deconvExplorer i…
Browse files Browse the repository at this point in the history
…nto app_finalize
  • Loading branch information
alex-d13 committed May 27, 2024
2 parents 344e768 + aa2a3bb commit 9f31edb
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
14 changes: 9 additions & 5 deletions R/DeconvExplorer.R
Original file line number Diff line number Diff line change
Expand Up @@ -1149,11 +1149,12 @@ DeconvExplorer <- function(deconvexp_bulk = NULL,

# start the tour
observeEvent(input$startTour, {
tour_steps <- read.delim(system.file("extdata", "tour_intro.txt",
package = "DeconvExplorer"
),
sep = ";", stringsAsFactors = FALSE,
row.names = NULL, quote = ""
tour_steps <- read.delim(
system.file("extdata", "tour_intro.txt",
package = "DeconvExplorer"
),
sep = ";", stringsAsFactors = FALSE,
row.names = NULL, quote = ""
)
introjs(session, options = list(
steps = tour_steps,
Expand Down Expand Up @@ -2099,7 +2100,10 @@ DeconvExplorer <- function(deconvexp_bulk = NULL,
},
deleteFile = TRUE
)
<<<<<<< HEAD

=======
>>>>>>> aa2a3bb4dc946dc1e3af93a5462df63292d64f52

# functions ---------------------------------------------------------------
brush_action <- function(df, input, output, session) {
Expand Down
6 changes: 2 additions & 4 deletions inst/deconvexplorer-webserver/app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#syntax=docker/dockerfile:1

FROM rocker/r-base
FROM rocker/r-base:4.4.0

# github setup
ARG GITHUB_PAT
Expand All @@ -27,8 +27,6 @@ RUN apt-get update && apt-get install -y \
# omnideconv and DeconvExplorer
#RUN install2.r --error textshaping



RUN R -e "install.packages('pak')"
RUN R -e "pak::pkg_install(c('car', 'matlib', 'remotes'))"
RUN R -e "remotes::install_github('omnideconv/omnideconv', dependencies=TRUE)"
Expand All @@ -46,7 +44,7 @@ RUN R -e "omnideconv::install_all_python()"

# Cibersort Source Code
COPY CIBERSORT.R .
RUN R -e "omnideconv::bseqsc_config(file = 'CIBERSORT.R')"
#RUN R -e "omnideconv::bseqsc_config(file = 'CIBERSORT.R')"

RUN groupadd shiny \
&& useradd --gid shiny --shell /bin/bash --create-home shiny
Expand Down

0 comments on commit 9f31edb

Please sign in to comment.