diff --git a/Dockerfile.focal b/Dockerfile.focal index df18eaf..616d362 100644 --- a/Dockerfile.focal +++ b/Dockerfile.focal @@ -138,9 +138,6 @@ ARG R_VERSION=4.2.2 RUN wget -q https://cdn.rstudio.com/r/ubuntu-2004/R-${R_VERSION}-ubuntu-2004.tar.gz -O /tmp/R-${R_VERSION}.tar.gz && \ mkdir -p /opt/R && \ tar zx -C /opt/R -f /tmp/R-${R_VERSION}.tar.gz && \ - ln -s /opt/R/${R_VERSION}/bin/R /usr/bin/R && \ - ln -s /opt/R/${R_VERSION}/bin/Rscript /usr/bin/Rscript && \ - ln -s /opt/R/${R_VERSION}/lib/R /usr/lib/R && \ rm /tmp/R-${R_VERSION}.tar.gz # set UTF-8 diff --git a/Dockerfile.jammy b/Dockerfile.jammy index 2bd5813..c37f5d9 100644 --- a/Dockerfile.jammy +++ b/Dockerfile.jammy @@ -91,10 +91,10 @@ RUN wget -q https://julialang-s3.julialang.org/bin/linux/x64/1.9/julia-1.9.1-lin rm julia-1.9.1-linux-x86_64.tar.gz # Install of texlive. Use --no-install-recommends to avoid installing ~750MB of documentation -RUN apt-get update -qq && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - texlive-full && \ - rm -rf /var/lib/apt/lists/* +# RUN apt-get update -qq && \ +# DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ +# texlive-full && \ +# rm -rf /var/lib/apt/lists/* # add in the less secure openssl config file @@ -117,11 +117,10 @@ COPY Renviron.site /etc/R/Renviron.site ARG R_VERSION=4.3.1 +ENV PATH /opt/R/${R_VERSION}/bin:$PATH + # Install R RUN wget -q https://cdn.rstudio.com/r/ubuntu-2204/R-${R_VERSION}-ubuntu-2204.tar.gz -O /tmp/R-${R_VERSION}.tar.gz && \ mkdir -p /opt/R && \ tar zx -C /opt/R -f /tmp/R-${R_VERSION}.tar.gz && \ - ln -s /opt/R/${R_VERSION}/bin/R /usr/bin/R && \ - ln -s /opt/R/${R_VERSION}/bin/Rscript /usr/bin/Rscript && \ - ln -s /opt/R/${R_VERSION}/lib/R /usr/lib/R && \ rm /tmp/R-${R_VERSION}.tar.gz diff --git a/Renviron.site b/Renviron.site index 634f7da..8a5ec32 100644 --- a/Renviron.site +++ b/Renviron.site @@ -2,3 +2,5 @@ LANG=C.UTF-8 # Otherwise timedatectl will get called which leads to 'no systemd' inside Docker TZ=UTC + +R_LIBS_USER=/usr/lib/R diff --git a/packages/rJava/install b/packages/rJava/install index d925b25..eb69a19 100755 --- a/packages/rJava/install +++ b/packages/rJava/install @@ -5,4 +5,4 @@ set -e apt-get update -qq apt-get install bzip2 libbz2-dev -/usr/bin/R CMD javareconf +R CMD javareconf