From d8d36a5092646d9a74d77bbfbfc83cf2bbab940e Mon Sep 17 00:00:00 2001 From: shane knapp Date: Mon, 12 Aug 2024 11:54:35 -0700 Subject: [PATCH] datahub R and Rstudio upgrayyyyed --- deployments/datahub/images/default/Dockerfile | 9 +++++---- deployments/datahub/images/default/Rprofile.site | 3 +-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/deployments/datahub/images/default/Dockerfile b/deployments/datahub/images/default/Dockerfile index 49062d34d..96b3f077a 100644 --- a/deployments/datahub/images/default/Dockerfile +++ b/deployments/datahub/images/default/Dockerfile @@ -50,16 +50,17 @@ RUN install -d -o ${NB_USER} -g ${NB_USER} ${R_LIBS_USER} # These packages must be installed into the base stage since they are in system # paths rather than /srv. # Pre-built R packages from rspm are built against system libs in jammy. -ENV R_VERSION=4.3.2-1.2204.0 -ENV LITTLER_VERSION=0.3.18-2.2204.0 +#ENV R_VERSION=4.3.2-1.2204.0 +#ENV LITTLER_VERSION=0.3.18-2.2204.0 +ENV R_VERSION=4.4.1-1.2204.0 +ENV LITTLER_VERSION=0.3.19-1.2204.0 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E298A3A825C0D65DFD57CBB651716619E084DAB9 RUN echo "deb https://cloud.r-project.org/bin/linux/ubuntu jammy-cran40/" > /etc/apt/sources.list.d/cran.list RUN curl --silent --location --fail https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc > /etc/apt/trusted.gpg.d/cran_ubuntu_key.asc RUN apt-get update --yes > /dev/null && \ apt-get install --yes -qq r-base-core=${R_VERSION} r-base-dev=${R_VERSION} littler=${LITTLER_VERSION} > /dev/null -#ENV RSTUDIO_URL https://download2.rstudio.org/server/jammy/amd64/rstudio-server-2023.06.0-421-amd64.deb -ENV RSTUDIO_URL https://download2.rstudio.org/server/jammy/amd64/rstudio-server-2023.12.0-369-amd64.deb +ENV RSTUDIO_URL=https://download2.rstudio.org/server/jammy/amd64/rstudio-server-2024.04.2-764-amd64.deb RUN curl --silent --location --fail ${RSTUDIO_URL} > /tmp/rstudio.deb && \ apt install --no-install-recommends --yes /tmp/rstudio.deb && \ rm /tmp/rstudio.deb diff --git a/deployments/datahub/images/default/Rprofile.site b/deployments/datahub/images/default/Rprofile.site index 9b6af5395..12886857d 100644 --- a/deployments/datahub/images/default/Rprofile.site +++ b/deployments/datahub/images/default/Rprofile.site @@ -16,8 +16,7 @@ options(repos = c(CRAN = "https://packagemanager.rstudio.com/all/__linux__/jammy # below sets it to be binary. This may improve image build times. # If it works, it'd be better to dynamically set the R version as above, and # also the RStudio Server version if possible. -options(HTTPUserAgent = "RStudio Server (2023.12.0.369); R (4.3.2 x86_64-pc-linux-gnu x86_64 linux-gnu)") - +options(HTTPUserAgent = "RStudio Server (2024.04.2.764); R (4.4.1 x86_64-pc-linux-gnu x86_64 linux-gnu)") ## Source extra Rprofile files. #