Merge pull request #694 from rstudio/dev

Update Workbench and Connect
rstudio · Feb 2, 2024 · 0e977e6 · 0e977e6
2 parents d48f2cc + 74129c8
commit 0e977e6
Show file tree

Hide file tree

Showing 29 changed files with 57 additions and 50 deletions.
diff --git a/Justfile b/Justfile
@@ -8,7 +8,7 @@ BUILDX_PATH := ""
 
 RSC_VERSION := "2024.01.0"
 RSPM_VERSION := "2023.12.0-13"
-RSW_VERSION := "2023.12.0+369.pro3"
+RSW_VERSION := "2023.12.1+402.pro1"
 
 DRIVERS_VERSION := "2023.05.0"
 DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1"

diff --git a/NEWS.md b/NEWS.md
@@ -5,6 +5,10 @@ changed in each image.
 
 This file only captures pervasive, repository-wide changes.
 
+# 2024-02-01
+
+- Update Pro Drivers to 2023.12.1
+
 # 2023-08-07
 
 - Removed base image Ubuntu 18.04 builds.

diff --git a/ci.Justfile b/ci.Justfile
@@ -9,7 +9,7 @@ R_VERSION_ALT := "4.1.3"
 PYTHON_VERSION := "3.9.17"
 PYTHON_VERSION_ALT := "3.8.17"
 
-DRIVERS_VERSION := "2023.05.0"
+DRIVERS_VERSION := "2023.12.1"
 DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1"
 
 QUARTO_VERSION := "1.3.340"

diff --git a/content/matrix.json b/content/matrix.json
@@ -1,23 +1,23 @@
 [
-  {"r": "3.1.3", "py": "2.7.18", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "3.2.5", "py": "2.7.18", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "3.3.3", "py": "3.6.13", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "3.4.4", "py": "3.6.13", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "3.4.4", "py": "3.7.10", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "3.5.3", "py": "2.7.18", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "3.5.3", "py": "3.7.10", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "3.6.3", "py": "2.7.18", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "3.6.3", "py": "3.6.13", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "3.6.3", "py": "3.8.8", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "4.0.5", "py": "3.6.13", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "4.0.5", "py": "3.7.10", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "4.0.5", "py": "3.8.8", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "4.0.5", "py": "3.9.2", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "4.1.0", "py": "3.8.8", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "4.1.0", "py": "3.9.2", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "4.1.3", "py": "3.10.4", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "3.6.3", "py": "3.8.16", "drivers": "2023.05.0", "os": "ubuntu2204", "os_alt": "jammy"},
-  {"r": "4.0.5", "py": "3.9.16", "drivers": "2023.05.0", "os": "ubuntu2204", "os_alt": "jammy"},
-  {"r": "4.1.3", "py": "3.10.11", "drivers": "2023.05.0", "os": "ubuntu2204", "os_alt": "jammy"},
-  {"r": "4.2.2", "py": "3.11.3", "drivers": "2023.05.0", "os": "ubuntu2204", "os_alt": "jammy"}
+  {"r": "3.1.3", "py": "2.7.18", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "3.2.5", "py": "2.7.18", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "3.3.3", "py": "3.6.13", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "3.4.4", "py": "3.6.13", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "3.4.4", "py": "3.7.10", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "3.5.3", "py": "2.7.18", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "3.5.3", "py": "3.7.10", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "3.6.3", "py": "2.7.18", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "3.6.3", "py": "3.6.13", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "3.6.3", "py": "3.8.8", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "4.0.5", "py": "3.6.13", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "4.0.5", "py": "3.7.10", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "4.0.5", "py": "3.8.8", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "4.0.5", "py": "3.9.2", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "4.1.0", "py": "3.8.8", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "4.1.0", "py": "3.9.2", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "4.1.3", "py": "3.10.4", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "3.6.3", "py": "3.8.16", "drivers": "2023.12.1", "os": "ubuntu2204", "os_alt": "jammy"},
+  {"r": "4.0.5", "py": "3.9.16", "drivers": "2023.12.1", "os": "ubuntu2204", "os_alt": "jammy"},
+  {"r": "4.1.3", "py": "3.10.11", "drivers": "2023.12.1", "os": "ubuntu2204", "os_alt": "jammy"},
+  {"r": "4.2.2", "py": "3.11.3", "drivers": "2023.12.1", "os": "ubuntu2204", "os_alt": "jammy"}
 ]
diff --git a/content/pro/Dockerfile.ubuntu1804 b/content/pro/Dockerfile.ubuntu1804
@@ -6,7 +6,7 @@ FROM ${REGISTRY}/rstudio/content-base:r${R_VERSION}-py${PYTHON_VERSION}-ubuntu18
 LABEL maintainer="RStudio Docker <[email protected]>"
 
 # Install RStudio Professional Drivers ----------------------------------------#
-ARG DRIVERS_VERSION=2023.05.0
+ARG DRIVERS_VERSION=2023.12.1
 ARG R_VERSION
 ARG DEBIAN_FRONTEND=noninteractive
 

diff --git a/content/pro/Dockerfile.ubuntu2204 b/content/pro/Dockerfile.ubuntu2204
@@ -6,7 +6,7 @@ FROM ${REGISTRY}/rstudio/content-base:r${R_VERSION}-py${PYTHON_VERSION}-ubuntu22
 LABEL maintainer="RStudio Docker <[email protected]>"
 
 # Install RStudio Professional Drivers ----------------------------------------#
-ARG DRIVERS_VERSION=2023.05.0
+ARG DRIVERS_VERSION=2023.12.1
 ARG R_VERSION
 ARG DEBIAN_FRONTEND=noninteractive
 

diff --git a/content/pro/Justfile b/content/pro/Justfile
@@ -10,7 +10,7 @@ R_VERSION := "3.6.3"
 
 PYTHON_VERSION := "3.9.5"
 
-DRIVERS_VERSION := "2023.05.0"
+DRIVERS_VERSION := "2023.12.1"
 DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1"
 
 DEFAULT_TAG := IMAGE_PREFIX + PRODUCT + ":r" + R_VERSION + "-py" + PYTHON_VERSION + "-" + IMAGE_OS

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
       context: ./workbench
       dockerfile: "Dockerfile.${IMAGE_OS:-ubuntu2204}"
       args:
-        RSW_VERSION: 2023.12.0+369.pro3
+        RSW_VERSION: 2023.12.1+402.pro1
     image: rstudio/rstudio-workbench:2023.12.0
     environment:
       RSW_LICENSE: ${RSW_LICENSE}

diff --git a/product/pro/Dockerfile.centos7 b/product/pro/Dockerfile.centos7
@@ -11,7 +11,7 @@ ARG R_VERSION=4.2.0
 ARG R_VERSION_ALT=3.6.2
 ARG PYTHON_VERSION=3.9.14
 ARG PYTHON_VERSION_ALT=3.8.15
-ARG DRIVERS_VERSION=2023.05.0-1
+ARG DRIVERS_VERSION=2023.12.1-1
 
 RUN yum update -y \
     && yum install -y unixODBC unixODBC-devel \

diff --git a/product/pro/Dockerfile.ubuntu2204 b/product/pro/Dockerfile.ubuntu2204
@@ -12,7 +12,7 @@ ARG R_VERSION=4.2.3
 ARG R_VERSION_ALT=4.1.3
 ARG PYTHON_VERSION=3.9.17
 ARG PYTHON_VERSION_ALT=3.8.17
-ARG DRIVERS_VERSION=2023.05.0
+ARG DRIVERS_VERSION=2023.12.1
 
 RUN apt-get update \
     && apt-get install -yq --no-install-recommends unixodbc unixodbc-dev \

diff --git a/product/pro/Justfile b/product/pro/Justfile
@@ -16,7 +16,7 @@ PYTHON_VERSION_ALT := "3.8.17"
 TINI_VERSION := "0.19.0"
 QUARTO_VERSION := "1.3.340"
 
-DRIVERS_VERSION := "2023.05.0"
+DRIVERS_VERSION := "2023.12.1"
 DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1"
 
 _make-default-tag OS=IMAGE_OS:

diff --git 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.12.0+369.pro3
+RSW_VERSION=2023.12.1+402.pro1
+DRIVERS_VERSION=2023.12.1-1
diff --git 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.12.0+369.pro3
+ARG RSW_VERSION=2023.12.1+402.pro1
 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
@@ -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.12.0+369.pro3
+ARG RSW_VERSION=2023.12.1+402.pro1
 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
@@ -6,10 +6,10 @@ IMAGE_PREFIX := ""
 PRODUCT := "r-session-complete"
 IMAGE_OS := "ubuntu2204"
 
-RSW_VERSION := "2023.12.0+369.pro3"
+RSW_VERSION := "2023.12.1+402.pro1"
 RSW_LICENSE := ""
 
-DRIVERS_VERSION := "2023.05.0"
+DRIVERS_VERSION := "2023.12.1"
 DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1"
 
 R_VERSION := "4.2.3"

diff --git 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.12.0`, `ubuntu2204-2023.12.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/r-session-complete/Dockerfile.ubuntu2204)
+* [`jammy`, `ubuntu2204`, `jammy-2023.12.1`, `ubuntu2204-2023.12.1`](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-google-cloud-workstations/.env b/workbench-for-google-cloud-workstations/.env
@@ -1,5 +1,5 @@
-RSW_VERSION=2023.09.1+494.pro2
-RSW_TAG_VERSION=2023.09.1-494.pro2
+RSW_VERSION=2023.12.1+402.pro1
+RSW_TAG_VERSION=2023.12.1-402.pro1
 RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/focal/amd64
 RSW_NAME=rstudio-workbench
 PYTHON_VERSION=3.10.13

diff --git a/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2004 b/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2004
@@ -10,7 +10,7 @@ ARG PYTHON_VERSION_JUPYTER=3.10.13
 ARG JUPYTERLAB_VERSION=3.6.5
 ARG QUARTO_VERSION=1.3.450
 ARG DRIVERS_VERSION=2023.05.0
-ARG RSW_VERSION=2023.12.0+369.pro3
+ARG RSW_VERSION=2023.12.1+402.pro1
 ARG RSW_NAME=rstudio-workbench
 ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/focal/amd64
 

diff --git a/workbench-for-microsoft-azure-ml/.env b/workbench-for-microsoft-azure-ml/.env
@@ -1,4 +1,4 @@
-RSW_VERSION=2023.12.0+369.pro3
+RSW_VERSION=2023.12.1+402.pro1
 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
@@ -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.12.0+369.pro3
+ARG RSW_VERSION=2023.12.1+402.pro1
 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
@@ -6,7 +6,7 @@ IMAGE_PREFIX := "rstudio-"
 PRODUCT := "workbench"
 IMAGE_OS := "ubuntu2204"
 
-RSW_VERSION := "2023.12.0+369.pro3"
+RSW_VERSION := "2023.12.1+402.pro1"
 RSW_LICENSE := ""
 
 R_VERSION := "4.2.3"

diff --git a/workbench-for-microsoft-azure-ml/NEWS.md b/workbench-for-microsoft-azure-ml/NEWS.md
@@ -1,3 +1,7 @@
+# 2024.02.1
+- Remove R 3.6.3 from image
+- Bump R versions to latest patches
+
 # 2023.03.1
 - No changes
 

diff --git a/workbench-for-microsoft-azure-ml/deps/install-r.sh b/workbench-for-microsoft-azure-ml/deps/install-r.sh
@@ -29,7 +29,7 @@ install_r_packages() {
 }
 
 
-for rvers in 3.6.3 4.0.5 4.1.3 4.2.3 4.3.1; do
+for rvers in 4.0.5 4.1.3 4.2.3 4.3.2; do
     # install r version
     curl -O https://cdn.rstudio.com/r/ubuntu-$(lsb_release -rs | sed 's/\.//g')/pkgs/r-${rvers}_1_amd64.deb
     DEBIAN_FRONTEND=noninteractive apt-get install -y ./r-${rvers}_1_amd64.deb

diff --git a/workbench-for-microsoft-azure-ml/deps/r_packages.txt b/workbench-for-microsoft-azure-ml/deps/r_packages.txt
@@ -46,7 +46,6 @@ readr
 readxl
 renv
 reticulate
-rgdal
 rlang
 rmarkdown
 roxygen2

diff --git a/workbench-for-microsoft-azure-ml/test/goss.yaml b/workbench-for-microsoft-azure-ml/test/goss.yaml
@@ -131,7 +131,7 @@ command:
 
   # test all R versions and packages
   # "/opt/R/3.3.3/bin/R" "/opt/R/3.4.4/bin/R"
-  {{ $rvers := mkSlice "/opt/R/3.6.3/bin/R" "/opt/R/4.0.5/bin/R" "/opt/R/4.1.3/bin/R" "/opt/R/4.2.3/bin/R" "/opt/R/4.3.1/bin/R"}}
+  {{ $rvers := mkSlice "/opt/R/4.0.5/bin/R" "/opt/R/4.1.3/bin/R" "/opt/R/4.2.3/bin/R" "/opt/R/4.3.2/bin/R"}}
   {{ $pkgs := .Vars.packages}}
   # loops the library command for each R version to ensure expected libraries exist for all.
   # notably, it also ensures that each expected R version exists and is runnable

diff --git a/workbench/.env b/workbench/.env
@@ -1,4 +1,4 @@
-RSW_VERSION=2023.12.0+369.pro3
+RSW_VERSION=2023.12.1+402.pro1
 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
@@ -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.12.0+369.pro3
+ARG RSW_VERSION=2023.12.1+402.pro1
 ARG RSW_NAME=rstudio-workbench
 ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64
 

diff --git a/workbench/Justfile b/workbench/Justfile
@@ -6,7 +6,7 @@ IMAGE_PREFIX := "rstudio-"
 PRODUCT := "workbench"
 IMAGE_OS := "ubuntu2204"
 
-RSW_VERSION := "2023.12.0+369.pro3"
+RSW_VERSION := "2023.12.1+402.pro1"
 RSW_RELEASE_TYPE := "release"
 RSW_LICENSE := ""
 RSW_LICENSE_SERVER := ""

diff --git a/workbench/README.md b/workbench/README.md
@@ -7,7 +7,7 @@
 
 # Supported tags and respective Dockerfile links
 
-* [`jammy`, `ubuntu2204`, `jammy-2023.12.0`, `ubuntu2204-2023.12.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/workbench/Dockerfile.ubuntu2204)
+* [`jammy`, `ubuntu2204`, `jammy-2023.12.1`, `ubuntu2204-2023.12.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/workbench/Dockerfile.ubuntu2204)
 
 # What is RStudio Workbench?