diff --git a/r-client/Dockerfile b/r-client/Dockerfile index 4d21f21..dc0eb73 100644 --- a/r-client/Dockerfile +++ b/r-client/Dockerfile @@ -81,19 +81,12 @@ RUN set -eux; \ [ 0 = `ldd /usr/lib64/R/bin/exec/R | grep 'not found' | wc -l` ] # -# Ubuntu R libraries install. +# R libraries install. # -RUN set -eux; \ - [ "${DISTRO_BASE_SHORT}" = "ubuntu" ] || exit 0; \ - . "${PREFIX}/env.sh"; \ - echo 'install.packages(c("Rcpp", "arrow", "R6", "dplyr", "testthat"), quiet=TRUE)' | \ - MAKEFLAGS="-j${NCPUS}" R --no-save - -# -# Fedora and RHEL R libraries install. +# Note repos=... is necessary for Fedora and RHEL. # RUN set -eux; \ [ "${DISTRO_BASE_SHORT}" = "fedora" ] || [ "${DISTRO_BASE_SHORT}" = "ubi" ] || exit 0; \ . "${PREFIX}/env.sh"; \ - echo 'install.packages(c("Rcpp", "arrow", "R6", "dplyr", "testthat"), repos="http://cran.us.r-project.org", quiet=TRUE)' | \ + echo 'install.packages(c("Rcpp", "arrow", "R6", "dplyr", "testthat", "xml2", "lubridate", "zoo"), repos="http://cran.us.r-project.org", quiet=TRUE)' | \ MAKEFLAGS="-j${NCPUS}" R --no-save