From 8c6e460ae337ca2ec76c41c8e2e7ddc5070363d2 Mon Sep 17 00:00:00 2001 From: Melissa Barca Date: Wed, 27 Sep 2023 12:08:47 -0400 Subject: [PATCH 1/2] update workbench to 2023.09.0 --- Justfile | 2 +- docker-compose.yml | 4 ++-- r-session-complete/.env | 2 +- r-session-complete/Dockerfile.centos7 | 2 +- r-session-complete/Dockerfile.ubuntu2204 | 2 +- r-session-complete/Justfile | 2 +- r-session-complete/README.md | 2 +- workbench-for-microsoft-azure-ml/.env | 2 +- workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204 | 2 +- workbench-for-microsoft-azure-ml/Justfile | 2 +- workbench/.env | 2 +- workbench/Dockerfile.ubuntu2204 | 2 +- workbench/Justfile | 2 +- workbench/README.md | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Justfile b/Justfile index a472571a..004ad006 100644 --- a/Justfile +++ b/Justfile @@ -8,7 +8,7 @@ BUILDX_PATH := "" RSC_VERSION := "2023.09.0" RSPM_VERSION := "2023.08.0-16" -RSW_VERSION := "2023.06.2+561.pro5" +RSW_VERSION := "2023.09.0+463.pro11" DRIVERS_VERSION := "2023.05.0" DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1" diff --git a/docker-compose.yml b/docker-compose.yml index b3999826..e379b7ec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,8 +7,8 @@ services: context: ./workbench dockerfile: "Dockerfile.${IMAGE_OS:-ubuntu2204}" args: - RSW_VERSION: 2023.06.2+561.pro5 - image: rstudio/rstudio-workbench:2023.06.2 + RSW_VERSION: 2023.09.0+463.pro11 + image: rstudio/rstudio-workbench:2023.09.0 environment: RSW_LICENSE: ${RSW_LICENSE} LICENSE_SERVER: ${RSW_LICENSE_SERVER} diff --git a/r-session-complete/.env b/r-session-complete/.env index b9aeefce..3109aada 100644 --- a/r-session-complete/.env +++ b/r-session-complete/.env @@ -1,4 +1,4 @@ R_VERSION=4.1.0 PYTHON_VERSION=3.9.5 DRIVERS_VERSION=2023.05.0-1 -RSW_VERSION=2023.06.2+561.pro5 +RSW_VERSION=2023.09.0+463.pro11 diff --git a/r-session-complete/Dockerfile.centos7 b/r-session-complete/Dockerfile.centos7 index 00f26fbb..a3456ed0 100644 --- a/r-session-complete/Dockerfile.centos7 +++ b/r-session-complete/Dockerfile.centos7 @@ -12,7 +12,7 @@ ARG R_VERSION_ALT=4.1.3 ARG PYTHON_VERSION=3.9.14 ARG PYTHON_VERSION_ALT=3.8.15 ARG JUPYTERLAB_VERSION=3.2.9 -ARG RSW_VERSION=2023.06.2+561.pro5 +ARG RSW_VERSION=2023.09.0+463.pro11 ARG RSW_NAME=rstudio-workbench-rhel ARG RSW_DOWNLOAD_URL=https://s3.amazonaws.com/rstudio-ide-build/server/centos7/x86_64 diff --git a/r-session-complete/Dockerfile.ubuntu2204 b/r-session-complete/Dockerfile.ubuntu2204 index 538935ca..d4a97571 100644 --- a/r-session-complete/Dockerfile.ubuntu2204 +++ b/r-session-complete/Dockerfile.ubuntu2204 @@ -13,7 +13,7 @@ ARG R_VERSION_ALT=4.1.3 ARG PYTHON_VERSION=3.9.17 ARG PYTHON_VERSION_ALT=3.8.17 ARG JUPYTERLAB_VERSION=3.6.5 -ARG RSW_VERSION=2023.06.2+561.pro5 +ARG RSW_VERSION=2023.09.0+463.pro11 ARG RSW_NAME=rstudio-workbench ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64 diff --git a/r-session-complete/Justfile b/r-session-complete/Justfile index 915788c0..c03175d2 100755 --- a/r-session-complete/Justfile +++ b/r-session-complete/Justfile @@ -6,7 +6,7 @@ IMAGE_PREFIX := "" PRODUCT := "r-session-complete" IMAGE_OS := "ubuntu2204" -RSW_VERSION := "2023.06.2+561.pro5" +RSW_VERSION := "2023.09.0+463.pro11" RSW_LICENSE := "" DRIVERS_VERSION := "2023.05.0" diff --git a/r-session-complete/README.md b/r-session-complete/README.md index b3b909d1..2c41eae3 100644 --- a/r-session-complete/README.md +++ b/r-session-complete/README.md @@ -7,7 +7,7 @@ # Supported tags and respective Dockerfile links -* [`jammy`, `ubuntu2204`, `jammy-2023.06.2`, `ubuntu2204-2023.06.2`](https://github.com/rstudio/rstudio-docker-products/blob/main/r-session-complete/Dockerfile.ubuntu2204) +* [`jammy`, `ubuntu2204`, `jammy-2023.09.0`, `ubuntu2204-2023.09.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/r-session-complete/Dockerfile.ubuntu2204) # What are the r-session-complete images? diff --git a/workbench-for-microsoft-azure-ml/.env b/workbench-for-microsoft-azure-ml/.env index 8c779713..71982d9f 100644 --- a/workbench-for-microsoft-azure-ml/.env +++ b/workbench-for-microsoft-azure-ml/.env @@ -1,4 +1,4 @@ -RSW_VERSION=2023.06.2+561.pro5 +RSW_VERSION=2023.09.0+463.pro11 RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/bionic/amd64 RSW_NAME=rstudio-workbench PYTHON_VERSION=3.9.14 diff --git a/workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204 b/workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204 index fb8cb46d..ac03929a 100644 --- a/workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204 +++ b/workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204 @@ -14,7 +14,7 @@ ARG PYTHON_VERSION=3.9.17 ARG PYTHON_VERSION_ALT=3.8.17 ARG PYTHON_VERSION_JUPYTER=3.8.17 ARG JUPYTERLAB_VERSION=3.6.5 -ARG RSW_VERSION=2023.06.2+561.pro5 +ARG RSW_VERSION=2023.09.0+463.pro11 ARG RSW_NAME=rstudio-workbench ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64 ARG DEBIAN_FRONTEND=noninteractive diff --git a/workbench-for-microsoft-azure-ml/Justfile b/workbench-for-microsoft-azure-ml/Justfile index 0792dd9c..d3d0dbd7 100644 --- a/workbench-for-microsoft-azure-ml/Justfile +++ b/workbench-for-microsoft-azure-ml/Justfile @@ -6,7 +6,7 @@ IMAGE_PREFIX := "rstudio-" PRODUCT := "workbench" IMAGE_OS := "ubuntu2204" -RSW_VERSION := "2023.06.2+561.pro5" +RSW_VERSION := "2023.09.0+463.pro11" RSW_LICENSE := "" R_VERSION := "4.2.3" diff --git a/workbench/.env b/workbench/.env index 78371003..ae460ca1 100644 --- a/workbench/.env +++ b/workbench/.env @@ -1,4 +1,4 @@ -RSW_VERSION=2023.06.2+561.pro5 +RSW_VERSION=2023.09.0+463.pro11 RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/bionic/amd64 RSW_NAME=rstudio-workbench PYTHON_VERSION=3.9.17 diff --git a/workbench/Dockerfile.ubuntu2204 b/workbench/Dockerfile.ubuntu2204 index ce8e2c37..972e88d2 100644 --- a/workbench/Dockerfile.ubuntu2204 +++ b/workbench/Dockerfile.ubuntu2204 @@ -14,7 +14,7 @@ ARG PYTHON_VERSION=3.9.17 ARG PYTHON_VERSION_ALT=3.8.17 ARG PYTHON_VERSION_JUPYTER=3.8.17 ARG JUPYTERLAB_VERSION=3.6.5 -ARG RSW_VERSION=2023.06.2+561.pro5 +ARG RSW_VERSION=2023.09.0+463.pro11 ARG RSW_NAME=rstudio-workbench ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64 diff --git a/workbench/Justfile b/workbench/Justfile index 48be2b16..5ac7497b 100644 --- a/workbench/Justfile +++ b/workbench/Justfile @@ -6,7 +6,7 @@ IMAGE_PREFIX := "rstudio-" PRODUCT := "workbench" IMAGE_OS := "ubuntu2204" -RSW_VERSION := "2023.06.2+561.pro5" +RSW_VERSION := "2023.09.0+463.pro11" RSW_LICENSE := "" RSW_LICENSE_SERVER := "" diff --git a/workbench/README.md b/workbench/README.md index 4a95cc96..3cfa43f6 100644 --- a/workbench/README.md +++ b/workbench/README.md @@ -7,7 +7,7 @@ # Supported tags and respective Dockerfile links -* [`jammy`, `ubuntu2204`, `jammy-2023.06.2`, `ubuntu2204-2023.06.2`](https://github.com/rstudio/rstudio-docker-products/blob/main/workbench/Dockerfile.ubuntu2204) +* [`jammy`, `ubuntu2204`, `jammy-2023.09.0`, `ubuntu2204-2023.09.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/workbench/Dockerfile.ubuntu2204) # What is RStudio Workbench? From 241c93a7af8a6efa14e42f9f5c9f4ae6c24f31a7 Mon Sep 17 00:00:00 2001 From: "Benjamin R. J. Schwedler" Date: Wed, 27 Sep 2023 11:27:24 -0500 Subject: [PATCH 2/2] Allow rspm symlink to fail if already exists Currently the production version of PPM does not create `/usr/local/bin/rspm` but the dev version does. We allow the symlink creation to fail and log if it is already present. --- package-manager/Dockerfile.ubuntu1804 | 2 +- package-manager/Dockerfile.ubuntu2204 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-manager/Dockerfile.ubuntu1804 b/package-manager/Dockerfile.ubuntu1804 index e7c79add..61a8321e 100644 --- a/package-manager/Dockerfile.ubuntu1804 +++ b/package-manager/Dockerfile.ubuntu1804 @@ -69,7 +69,7 @@ RUN apt-get update --fix-missing \ && apt-get autoremove -y \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* \ - && ln -s /opt/rstudio-pm/bin/rspm /usr/local/bin/rspm + && (ln -s /opt/rstudio-pm/bin/rspm /usr/local/bin/rspm || echo "/usr/local/bin/rspm symlink already exists") # Set default R version symlink RUN ln -s /opt/R/${R_VERSION} /opt/R/default diff --git a/package-manager/Dockerfile.ubuntu2204 b/package-manager/Dockerfile.ubuntu2204 index f835c3ff..f7f9b09b 100644 --- a/package-manager/Dockerfile.ubuntu2204 +++ b/package-manager/Dockerfile.ubuntu2204 @@ -60,7 +60,7 @@ RUN apt-get update --fix-missing \ && apt-get autoremove -y \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* \ - && ln -s /opt/rstudio-pm/bin/rspm /usr/local/bin/rspm + && (ln -s /opt/rstudio-pm/bin/rspm /usr/local/bin/rspm || echo "/usr/local/bin/rspm symlink already exists") # Set default R version symlink RUN ln -s /opt/R/${R_VERSION} /opt/R/default