Skip to content

Commit de535cb

Browse files
authored
Merge pull request #35 from liuzan-info/p2a
solve conflict
2 parents b721664 + 58673f5 commit de535cb

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ RUN aliyunpan download PhosMap_datasets.zip --save && unzip PhosMap_datasets.zip
1414

1515
# Install dependencies
1616
RUN R -e "devtools::install_github(c('evocellnet/ksea', 'omarwagih/rmotifx', 'ecnuzdd/PhosMap'))"
17-
RUN sudo apt-get install -y libgtk-3-dev cmake build-essential libcurl4-gnutls-dev libxml2 libxml2-dev libodbc1 libssl-dev libv8-dev libsodium-dev&& apt-get clean
17+
RUN sudo apt-get install -y libgtk-3-dev cmake build-essential libcurl4-gnutls-dev libxml2 libxml2-dev libodbc1 libssl-dev libv8-dev libsodium-dev && apt-get clean
18+
RUN wget https://cran.r-project.org/src/contrib/Archive/estimability/estimability_1.4.1.tar.gz && wget https://cran.r-project.org/src/contrib/Archive/emmeans/emmeans_1.8.9.tar.gz && wget https://cran.r-project.org/src/contrib/Archive/FactoMineR/FactoMineR_2.9.tar.gz
1819
RUN Rscript /srv/shiny-server/r_packages_install.R
1920
RUN R -e "remove.packages('Matrix')"
2021
RUN R -e "devtools::install_version('Matrix', version='1.5-3')"

r_packages_install.R

+6-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,9 @@ if (!require("BiocManager", quietly = TRUE)){install.packages("BiocManager")}
44

55
BiocManager::install(c("pcaMethods", "impute"))
66

7-
install.packages(c("FactoMineR","factoextra","data.table","tidyr","shiny","shinyjs","shinyBS","shinyWidgets","ggplot2","ggrepel","plotly","colourpicker","ggseqlogo","pheatmap","survminer","survival","zip","stringr","dplyr","DT","png","svglite","ggplotify","bslib","qpdf", "rrcovNA", "e1071", "heatmaply", "ggdendro"))
7+
# due to FactoMineR's update, dependency conflict occurs
8+
install.packages("estimability_1.4.1.tar.gz", type="Source", repos=NULL)
9+
install.packages("emmeans_1.8.9.tar.gz", type="Source", repos=NULL)
10+
install.packages("FactoMineR_2.9.tar.gz", type="Source", repos=NULL)
11+
12+
install.packages(c("factoextra","data.table","tidyr","shiny","shinyjs","shinyBS","shinyWidgets","ggplot2","ggrepel","plotly","colourpicker","ggseqlogo","pheatmap","survminer","survival","zip","stringr","dplyr","DT","png","svglite","ggplotify","bslib","qpdf", "rrcovNA", "e1071", "heatmaply", "ggdendro"))

0 commit comments

Comments
 (0)