update Dockerfile

loicguille · Apr 4, 2023 · f64e87a · f64e87a
1 parent c8366cf
commit f64e87a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -5,11 +5,7 @@ FROM rocker/shiny:4.1.2
 
 RUN apt-get update && apt-get install -y libcurl4-gnutls-dev libssl-dev libxml2
 RUN apt-get install -y libhdf5-dev
-<<<<<<< HEAD
-RUN R -e 'install.packages(c("BiocManager","ggplot2", "Seurat","DT", "waiter","hdf5r", "shinycssloaders", "clustree", "Rcpp", "remotes", "shinymanager", "cowplot", "RColorBrewer","plotly","dplyr","Matrix","shinyjs","shinyalert","bslib","SeuratObject","colourpicker","rlang","rmarkdown"))'
-=======
 RUN R -e 'install.packages(c("BiocManager","ggplot2", "Seurat","DT", "waiter","hdf5r", "shinycssloaders", "clustree", "Rcpp", "remotes", "shinymanager", "cowplot", "RColorBrewer","plotly","dplyr","Matrix","shinyjs","shinyalert","bslib","SeuratObject","colourpicker","rlang", "rmarkdown"))'
->>>>>>> development
 RUN R -e 'remotes::install_github("igraph/rigraph")'
 
 COPY shiny-server.conf /etc/shiny-server/shiny-server.conf