diff --git a/Dockerfile b/Dockerfile index 7a2fe6e7..c63faf2f 100755 --- a/Dockerfile +++ b/Dockerfile @@ -341,8 +341,9 @@ RUN set -uex; \ apt install -y software-properties-common apt-transport-https; \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E298A3A825C0D65DFD57CBB651716619E084DAB9; \ add-apt-repository 'deb https://cloud.r-project.org/bin/linux/ubuntu bionic-cran35/'; \ - apt update; \ - apt install -y r-base libblas-dev liblapack-dev gfortran g++ libgl1-mesa-glx; \ + apt-get update; \ + apt-get install -y r-base libblas-dev liblapack-dev gfortran g++ libgl1-mesa-glx; \ + apt-get install -y r-base-dev; \ rm -rf /var/lib/apt/lists/*; COPY ./R_config/* /opt/ diff --git a/R_config/ROCR_1.0-11.tar.gz b/R_config/ROCR_1.0-11.tar.gz deleted file mode 100644 index b95fcdb9..00000000 Binary files a/R_config/ROCR_1.0-11.tar.gz and /dev/null differ diff --git a/R_config/e1071_1.7-13.tar.gz b/R_config/e1071_1.7-13.tar.gz deleted file mode 100644 index 444f3cf3..00000000 Binary files a/R_config/e1071_1.7-13.tar.gz and /dev/null differ diff --git a/R_config/install_R_env.sh b/R_config/install_R_env.sh index 91b61bf7..dd56ce68 100755 --- a/R_config/install_R_env.sh +++ b/R_config/install_R_env.sh @@ -14,9 +14,6 @@ R -e 'install.packages("/opt/randomForest_4.6-14.tar.gz", repos = NULL, type = " R -e 'install.packages("/opt/MASS_7.3-54.tar.gz", repos = NULL, type = "source")' R -e 'install.packages("/opt/class_7.3-19.tar.gz", repos = NULL, type = "source")' R -e 'install.packages("/opt/kernlab_0.9-32.tar.gz", repos = NULL, type = "source")' -R -e 'install.packages("/opt/ROCR_1.0-11.tar.gz", repos = NULL, type = "source")' -R -e 'install.packages("/opt/party_1.3-13.tar.gz", repos = NULL, type = "source")' -R -e 'install.packages("/opt/e1071_1.7-13.tar.gz", repos = NULL, type = "source")' R -e "install.packages('versions')" R -e "install.packages('Matrix', version = '1.2-18')" @@ -29,3 +26,8 @@ R -e "install.packages('mvtnorm', version = '1.1-1')" R -e "install.packages('coin', version = '1.3-1')" R -e "install.packages('pkgconfig', version = '2.0.3')" R -e "install.packages('libcoin')" + +# Packages for fsl-fix +R -e "install.packages('ROCR', version = '1.0-11')" +R -e "install.packages('party', version = '1.3-13')" +R -e "install.packages('e1071', version = '1.7-4')" diff --git a/R_config/party_1.3-13.tar.gz b/R_config/party_1.3-13.tar.gz deleted file mode 100644 index 08094163..00000000 Binary files a/R_config/party_1.3-13.tar.gz and /dev/null differ