diff --git a/Dockerfile b/Dockerfile index 954ebfc..61eaf60 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,8 @@ RUN apt-get update && apt-get install -y \ proj-bin \ proj-data \ libgsl23 \ - postgresql-server-dev-all + postgresql-server-dev-all \ + libsecret-1-0 # Install the R packages we need, using the binary distribution # at https://packagemanager.rstudio.com/client/#/repos/1/overview @@ -44,12 +45,17 @@ RUN for l in `cat /tmp/r_non_cran_pkgs.txt` ; do \ # From github ADD https://code-repo.d4science.org/gCubeSystem/r-packages-list/raw/branch/master/r_github_pkgs.txt /tmp +RUN mkdir -p /etc/R RUN echo "GITHUB_PAT=$GITHUB_PAT" >> /etc/R/Renviron.site - #RUN for g in `cat /tmp/r_github_pkgs.txt` ; do \ # Rscript --slave --no-site-file --no-init-file --no-save --no-restore-history \ # -e " require(devtools); devtools::install_github('$g')" ; done RUN export GITHUB_PAT ; for g in `cat /tmp/r_github_pkgs.txt` ; do installGithub.r -d TRUE -u FALSE -r https://packagemanager.rstudio.com/all/__linux__/focal/latest $g ; done +RUN grep -v "GITHUB_PATH" /etc/R/Renviron.site > /etc/R/Renviron.site.1 +RUN mv -f /etc/R/Renviron.site.1 /etc/R/Renviron.site + +# Ensure that we remove the source packages +RUN rm -fr /tmp/downloaded_packages/* RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh