Compare commits

..

No commits in common. "main" and "4.2" have entirely different histories.
main ... 4.2

1 changed files with 4 additions and 7 deletions

View File

@ -15,7 +15,6 @@ RUN apt-get update --yes && \
curl \
jags \
libxml2 \
libxt6 \
git \
gdal-bin \
libgdal-dev \
@ -29,7 +28,6 @@ RUN apt-get update --yes && \
libharfbuzz-dev \
libfribidi-dev \
sshpass \
patch \
p7zip-full \
sox \
imagemagick \
@ -41,13 +39,12 @@ RUN apt-get update --yes && \
fuse \
zip \
jq \
openjdk-8-jdk-headless \
openjdk-11-jdk-headless
openjdk-8-jdk-headless
# Install the R packages we need, using the binary distribution
# at https://packagemanager.rstudio.com/client/#/repos/1/overview
ADD https://code-repo.d4science.org/gCubeSystem/r-packages-list/raw/branch/master/install2r-packages.txt /tmp
RUN for f in `cat /tmp/install2r-packages.txt` ; do install2.r --error --skipinstalled --ncpus -1 $f || exit 1 ; done
RUN for f in `cat /tmp/install2r-packages.txt` ; do install2.r --error --skipinstalled --ncpus -1 $f ; done
# Non CRAN repositories
ADD https://code-repo.d4science.org/gCubeSystem/r-packages-list/raw/branch/master/r_non_cran_pkgs.txt /tmp
@ -55,7 +52,7 @@ RUN for l in `cat /tmp/r_non_cran_pkgs.txt` ; do \
pkg=`echo $l | cut -d : -f 1` ; \
mirror=`echo $l | cut -d : -f 2-` ; \
Rscript --slave --no-site-file --no-init-file --no-save --no-restore-history \
-e "install.packages(pkgs='$pkg', repos=c('$mirror/'));" || exit 1 ; done
-e "install.packages(pkgs='$pkg', repos=c('$mirror/'));" ; done
# Install some CRAN packages from source
ADD https://code-repo.d4science.org/gCubeSystem/r-packages-list/raw/branch/master/jupyter-image-r-cran-pkgs.txt /tmp
@ -63,7 +60,7 @@ RUN for cr in `cat /tmp/jupyter-image-r-cran-pkgs.txt` ; do \
pkg=`echo $cr` ; \
mirror='https://cloud.r-project.org' ; \
Rscript --slave --no-site-file --no-init-file --no-save --no-restore-history \
-e "install.packages(pkgs='$pkg', repos=c('$mirror/'));" || exit 1 ; done
-e "install.packages(pkgs='$pkg', repos=c('$mirror/'));" ; done
# From github
ADD https://code-repo.d4science.org/gCubeSystem/r-packages-list/raw/branch/master/r_github_pkgs.txt /tmp