From e36f2e42788bb48faf9ad48f21cfa3018888e08e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rok=20Ro=C5=A1kar?= Date: Thu, 19 Oct 2023 16:35:11 +0200 Subject: [PATCH 1/3] chore: add new R version --- .github/workflows/build-and-push-to-docker.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build-and-push-to-docker.yml b/.github/workflows/build-and-push-to-docker.yml index 5a2682ea..071cfe9b 100644 --- a/.github/workflows/build-and-push-to-docker.yml +++ b/.github/workflows/build-and-push-to-docker.yml @@ -526,6 +526,12 @@ jobs: - RVERSION: 4.2.0 BASE_IMAGE_NAME: rocker/verse EXTENSION: r + - RVERSION: 4.2.3 + BASE_IMAGE_NAME: rocker/verse + EXTENSION: r + - RVERSION: 4.3.1 + BASE_IMAGE_NAME: rocker/verse + EXTENSION: r - RVERSION: devel BASE_IMAGE_NAME: rocker/verse EXTENSION: r From 00204073047982191c9e7d1a4e0af6f15c78129b Mon Sep 17 00:00:00 2001 From: Richard James Acton Date: Thu, 12 Oct 2023 16:58:05 +0100 Subject: [PATCH 2/3] chore: R & RStudio to latest rocker with CRAN snapshot --- docker/r/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/r/Dockerfile b/docker/r/Dockerfile index bb7b269a..4384acba 100644 --- a/docker/r/Dockerfile +++ b/docker/r/Dockerfile @@ -1,6 +1,6 @@ # define build arguments ARG RENKU_BASE=renku/renkulab-py:latest -ARG BASE_IMAGE=rocker/verse:devel +ARG BASE_IMAGE=rocker/verse:4.3.0 # define base images FROM $RENKU_BASE as renku_base @@ -32,7 +32,7 @@ RUN echo "PATH=${PATH}" >> /usr/local/lib/R/etc/Renviron.site && \ ENV LD_LIBRARY_PATH /usr/local/lib/R/lib # pin the version of RStudio -ARG RSTUDIO_VERSION_OVERRIDE="2022.02.3-492" +ARG RSTUDIO_VERSION_OVERRIDE="2023.06.0-421" ENV RSTUDIO_VERSION=${RSTUDIO_VERSION_OVERRIDE} # if rstudio and rstudio-server users are not deleted below, the installation # script fails when it installs rstudio and tries to add them back in From b68f04bd7f68d7155d7c43e29912bf1c6c6d7069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rok=20Ro=C5=A1kar?= Date: Wed, 25 Oct 2023 08:41:05 +0000 Subject: [PATCH 3/3] chore: keep devel as default --- docker/r/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/r/Dockerfile b/docker/r/Dockerfile index 4384acba..b2738426 100644 --- a/docker/r/Dockerfile +++ b/docker/r/Dockerfile @@ -1,6 +1,6 @@ # define build arguments ARG RENKU_BASE=renku/renkulab-py:latest -ARG BASE_IMAGE=rocker/verse:4.3.0 +ARG BASE_IMAGE=rocker/verse:devel # define base images FROM $RENKU_BASE as renku_base