Skip to content

Commit

Permalink
Fix rJava's path.
Browse files Browse the repository at this point in the history
  • Loading branch information
seansinnott committed Jan 12, 2024
1 parent 57e9038 commit eaf049c
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 11 deletions.
3 changes: 0 additions & 3 deletions Dockerfile.focal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 6 additions & 7 deletions Dockerfile.jammy
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 2 additions & 0 deletions Renviron.site
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion packages/rJava/install
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ set -e
apt-get update -qq
apt-get install bzip2 libbz2-dev

/usr/bin/R CMD javareconf
R CMD javareconf

0 comments on commit eaf049c

Please sign in to comment.