From 143c198db9a469f862aaa2589762df529b1b47f0 Mon Sep 17 00:00:00 2001 From: Chris Black Date: Wed, 17 Jul 2024 02:51:48 -0700 Subject: [PATCH 1/2] tweaks to make rstudio devel build on Ubuntu 24 --- scripts/install_rstudio.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/install_rstudio.sh b/scripts/install_rstudio.sh index 7e0b70f0..39496f50 100755 --- a/scripts/install_rstudio.sh +++ b/scripts/install_rstudio.sh @@ -33,11 +33,11 @@ apt_install \ libcurl4-openssl-dev \ libedit2 \ libobjc4 \ + libsqlite3-0 \ libssl-dev \ libpq5 \ psmisc \ procps \ - python-setuptools \ pwgen \ sudo \ wget @@ -58,6 +58,10 @@ if [ "$UBUNTU_CODENAME" = "focal" ]; then UBUNTU_CODENAME="bionic" fi +if [ "$UBUNTU_CODENAME" = "noble" ]; then + UBUNTU_CODENAME="jammy" +fi + if [ "$RSTUDIO_VERSION" = "stable" ] || [ "$RSTUDIO_VERSION" = "preview" ] || [ "$RSTUDIO_VERSION" = "daily" ]; then if [ "$UBUNTU_CODENAME" = "bionic" ]; then UBUNTU_CODENAME="focal" From fef5990eca151d350208dec5c4817477006b87c7 Mon Sep 17 00:00:00 2001 From: Chris Black Date: Tue, 6 Aug 2024 11:51:10 -0700 Subject: [PATCH 2/2] Use devel version of Rstudio --- build/args/devel.json | 2 +- dockerfiles/geospatial_devel.Dockerfile | 2 +- dockerfiles/ml-verse_devel.Dockerfile | 2 +- dockerfiles/ml_devel.Dockerfile | 2 +- dockerfiles/rstudio_devel.Dockerfile | 2 +- dockerfiles/tidyverse_devel.Dockerfile | 2 +- dockerfiles/verse_devel.Dockerfile | 2 +- scripts/install_rstudio.sh | 8 ++++---- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build/args/devel.json b/build/args/devel.json index cb71654e..9f9fa101 100644 --- a/build/args/devel.json +++ b/build/args/devel.json @@ -5,7 +5,7 @@ "ubuntu_series": "latest", "ubuntu_version": null, "cran": "https://cloud.r-project.org", - "rstudio_version": "2024.04.2+764", + "rstudio_version": "latest", "ctan": "https://mirror.ctan.org/systems/texlive/tlnet", "r_major_latest": null, "r_minor_latest": null diff --git a/dockerfiles/geospatial_devel.Dockerfile b/dockerfiles/geospatial_devel.Dockerfile index 3296fb6f..aa516508 100644 --- a/dockerfiles/geospatial_devel.Dockerfile +++ b/dockerfiles/geospatial_devel.Dockerfile @@ -18,7 +18,7 @@ COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh RUN /rocker_scripts/install_tidyverse.sh ENV S6_VERSION="v2.1.0.2" -ENV RSTUDIO_VERSION="2024.04.2+764" +ENV RSTUDIO_VERSION="latest" ENV DEFAULT_USER="rstudio" COPY scripts/install_rstudio.sh /rocker_scripts/install_rstudio.sh diff --git a/dockerfiles/ml-verse_devel.Dockerfile b/dockerfiles/ml-verse_devel.Dockerfile index 676f4103..8272ab1b 100644 --- a/dockerfiles/ml-verse_devel.Dockerfile +++ b/dockerfiles/ml-verse_devel.Dockerfile @@ -34,7 +34,7 @@ COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh RUN /rocker_scripts/install_tidyverse.sh ENV S6_VERSION="v2.1.0.2" -ENV RSTUDIO_VERSION="2024.04.2+764" +ENV RSTUDIO_VERSION="latest" ENV DEFAULT_USER="rstudio" COPY scripts/install_rstudio.sh /rocker_scripts/install_rstudio.sh diff --git a/dockerfiles/ml_devel.Dockerfile b/dockerfiles/ml_devel.Dockerfile index ac66d0c0..637ab6c1 100644 --- a/dockerfiles/ml_devel.Dockerfile +++ b/dockerfiles/ml_devel.Dockerfile @@ -34,7 +34,7 @@ COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh RUN /rocker_scripts/install_tidyverse.sh ENV S6_VERSION="v2.1.0.2" -ENV RSTUDIO_VERSION="2024.04.2+764" +ENV RSTUDIO_VERSION="latest" ENV DEFAULT_USER="rstudio" COPY scripts/install_rstudio.sh /rocker_scripts/install_rstudio.sh diff --git a/dockerfiles/rstudio_devel.Dockerfile b/dockerfiles/rstudio_devel.Dockerfile index fb3b0d2f..d01b0822 100644 --- a/dockerfiles/rstudio_devel.Dockerfile +++ b/dockerfiles/rstudio_devel.Dockerfile @@ -15,7 +15,7 @@ COPY scripts/setup_R.sh /rocker_scripts/setup_R.sh RUN /rocker_scripts/setup_R.sh ENV S6_VERSION="v2.1.0.2" -ENV RSTUDIO_VERSION="2024.04.2+764" +ENV RSTUDIO_VERSION="latest" ENV DEFAULT_USER="rstudio" COPY scripts/install_rstudio.sh /rocker_scripts/install_rstudio.sh diff --git a/dockerfiles/tidyverse_devel.Dockerfile b/dockerfiles/tidyverse_devel.Dockerfile index d0c3e524..5de8429d 100644 --- a/dockerfiles/tidyverse_devel.Dockerfile +++ b/dockerfiles/tidyverse_devel.Dockerfile @@ -18,7 +18,7 @@ COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh RUN /rocker_scripts/install_tidyverse.sh ENV S6_VERSION="v2.1.0.2" -ENV RSTUDIO_VERSION="2024.04.2+764" +ENV RSTUDIO_VERSION="latest" ENV DEFAULT_USER="rstudio" COPY scripts/install_rstudio.sh /rocker_scripts/install_rstudio.sh diff --git a/dockerfiles/verse_devel.Dockerfile b/dockerfiles/verse_devel.Dockerfile index bc031b03..11ebd0f5 100644 --- a/dockerfiles/verse_devel.Dockerfile +++ b/dockerfiles/verse_devel.Dockerfile @@ -18,7 +18,7 @@ COPY scripts/install_tidyverse.sh /rocker_scripts/install_tidyverse.sh RUN /rocker_scripts/install_tidyverse.sh ENV S6_VERSION="v2.1.0.2" -ENV RSTUDIO_VERSION="2024.04.2+764" +ENV RSTUDIO_VERSION="latest" ENV DEFAULT_USER="rstudio" COPY scripts/install_rstudio.sh /rocker_scripts/install_rstudio.sh diff --git a/scripts/install_rstudio.sh b/scripts/install_rstudio.sh index 39496f50..f26f66f4 100755 --- a/scripts/install_rstudio.sh +++ b/scripts/install_rstudio.sh @@ -58,14 +58,14 @@ if [ "$UBUNTU_CODENAME" = "focal" ]; then UBUNTU_CODENAME="bionic" fi -if [ "$UBUNTU_CODENAME" = "noble" ]; then - UBUNTU_CODENAME="jammy" -fi - if [ "$RSTUDIO_VERSION" = "stable" ] || [ "$RSTUDIO_VERSION" = "preview" ] || [ "$RSTUDIO_VERSION" = "daily" ]; then if [ "$UBUNTU_CODENAME" = "bionic" ]; then UBUNTU_CODENAME="focal" fi + if [ "$UBUNTU_CODENAME" = "noble" ]; then + # use Jammy link per https://dailies.rstudio.com/links/ - last checked 2024-08-05 + UBUNTU_CODENAME="jammy" + fi wget "https://rstudio.org/download/latest/${RSTUDIO_VERSION}/server/${UBUNTU_CODENAME}/rstudio-server-latest-${ARCH}.deb" -O "$DOWNLOAD_FILE" else wget "https://download2.rstudio.org/server/${UBUNTU_CODENAME}/${ARCH}/rstudio-server-${RSTUDIO_VERSION/"+"/"-"}-${ARCH}.deb" -O "$DOWNLOAD_FILE" ||