Merge pull request #742 from rstudio/dev

Release Workbench `2024.04.0` & Connect `2024.04.0`
rstudio · Apr 30, 2024 · d57a505 · d57a505
2 parents c20b809 + 75f550b
commit d57a505
Show file tree

Hide file tree

Showing 24 changed files with 44 additions and 106 deletions.
diff --git a/.github/workflows/build-bake-preview.yaml b/.github/workflows/build-bake-preview.yaml
@@ -1,7 +1,6 @@
 on:
   schedule:
-    - cron: '0 8 * * *'
-    - cron: '0 9 * * *'
+    - cron: '0 * * * *'
   push:
     branches:
       - main

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -24,7 +24,6 @@ jobs:
           - {product: 'connect', os: 'ubuntu2204'}
           - {product: 'connect-content-init', os: 'ubuntu2204'}
           - {product: 'package-manager', os: 'ubuntu2204'}
-          - {product: 'r-session-complete', os: 'centos7'}
           - {product: 'r-session-complete', os: 'ubuntu2204'}
           - {product: 'workbench-for-microsoft-azure-ml', os: 'ubuntu2204'}
           - {product: 'content/base', os: 'ubuntu1804'}

diff --git a/Justfile b/Justfile
@@ -7,9 +7,9 @@ sed_vars := if os() == "macos" { "-i ''" } else { "-i" }
 
 BUILDX_PATH := ""
 
-RSC_VERSION := "2024.03.0"
+RSC_VERSION := "2024.04.0"
 RSPM_VERSION := "2023.12.0-13"
-RSW_VERSION := "2023.12.1+402.pro1"
+RSW_VERSION := "2024.04.0+735.pro3"
 
 DRIVERS_VERSION := "2023.05.0"
 DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1"
@@ -22,7 +22,7 @@ PYTHON_VERSION_ALT := "3.8.17"
 PYTHON_VERSION_RHEL := "3.9.14"
 PYTHON_VERSION_ALT_RHEL := "3.8.15"
 
-QUARTO_VERSION := "1.3.450"
+QUARTO_VERSION := "1.4.553"
 
 export RSC_LICENSE := ""
 export RSPM_LICENSE := ""
@@ -266,11 +266,7 @@ update-rsc-versions:
     connect/.env \
     connect/Dockerfile.ubuntu2204 \
     connect-content-init/Dockerfile.ubuntu2204
-  sed {{ sed_vars }} "s/RSC_VERSION:.*/RSC_VERSION: {{ RSC_VERSION }}/g" docker-compose.yml
-  sed {{ sed_vars }} "s/rstudio\/rstudio-connect:.*/rstudio\/rstudio-connect:{{ RSC_VERSION }}/g" docker-compose.yml
   sed {{ sed_vars }} "s/^RSC_VERSION := .*/RSC_VERSION := \"{{ RSC_VERSION }}\"/g" \
-    connect/Justfile \
-    connect-content-init/Justfile \
     Justfile
   sed {{ sed_vars }} -E "s/[0-9]{4}\.[0-9]{1,2}\.[0-9]{1,2}/`just _get-clean-version {{ RSC_VERSION }}`/g" \
     connect/README.md \

diff --git a/connect-content-init/Dockerfile.ubuntu2204 b/connect-content-init/Dockerfile.ubuntu2204
@@ -9,7 +9,7 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends ca-certificates curl && \
     rm -rf /var/lib/apt/lists/*
 
-ARG RSC_VERSION=2024.03.0
+ARG RSC_VERSION=2024.04.0
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN mkdir -p /rsc-staging && \
     RSC_VERSION_URL=$(echo -n "${RSC_VERSION}" | sed 's/+/%2B/g') && \

diff --git a/connect-content-init/README.md b/connect-content-init/README.md
@@ -9,7 +9,7 @@
 
 # Supported tags and respective Dockerfile links
 
-* [`jammy`, `ubuntu2204`, `jammy-2024.03.0`, `ubuntu2204-2024.03.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)
+* [`jammy`, `ubuntu2204`, `jammy-2024.04.0`, `ubuntu2204-2024.04.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)
 
 # RStudio Connect Content Init Container
 
@@ -31,7 +31,7 @@ The version of the release package to use can be overridden with the
 `RSC_VERSION` build arg.
 
 ```console
-just build ubuntu2204 2024.03.0
+just build ubuntu2204 2024.04.0
 ```
 
 ## Testing
@@ -56,7 +56,7 @@ just test
 You can see the different layers that make up the image:
 
 ```console
-docker history rstudio/rstudio-connect-content-init-preview:2024.03.0-dev-326
+docker history rstudio/rstudio-connect-content-init-preview:2024.04.0-dev-326
 ```
 
 NOTE: almost all the image size is pandoc.

diff --git a/connect/.env b/connect/.env
@@ -1,4 +1,4 @@
-RSC_VERSION=2024.03.0
+RSC_VERSION=2024.04.0
 R_VERSION=4.2.3
 R_VERSION_ALT=4.1.3
 PYTHON_VERSION=3.9.17

diff --git a/connect/Dockerfile.ubuntu2204 b/connect/Dockerfile.ubuntu2204
@@ -7,8 +7,8 @@ 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 RSC_VERSION=2024.03.0
-ARG QUARTO_VERSION=1.3.340
+ARG RSC_VERSION=2024.04.0
+ARG QUARTO_VERSION=1.4.552
 ARG SCRIPTS_DIR=/opt/positscripts
 
 ### Install Quarto ###

diff --git a/connect/NEWS.md b/connect/NEWS.md
@@ -1,3 +1,7 @@
+# 2024-04-30
+
+- BREAKING: Upgrade the default Quarto version to 1.4.552.
+
 # 2023-08-01
 - BREAKING: Removed R 3.6.2, replaced with R 4.1.3.
 - Updated R 4.2.0 to 4.2.3.

diff --git a/connect/README.md b/connect/README.md
@@ -7,7 +7,7 @@
 
 # Supported tags and respective Dockerfile links
 
-* [`jammy`, `ubuntu2204`, `jammy-2024.03.0`, `ubuntu2204-2024.03.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)
+* [`jammy`, `ubuntu2204`, `jammy-2024.04.0`, `ubuntu2204-2024.04.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)
 
 # What is Posit Connect?
 

diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -1,14 +1,14 @@
 ### Variable definitions ###
 variable CONNECT_VERSION {
-    default = "2024.03.0"
+    default = "2024.04.0"
 }
 
 variable PACKAGE_MANAGER_VERSION {
     default = "2023.12.0-13"
 }
 
 variable WORKBENCH_VERSION {
-    default = "2023.12.1+402.pro1"
+    default = "2024.04.0+735.pro3"
 }
 
 variable DRIVERS_VERSION {
@@ -101,7 +101,7 @@ variable PACKAGE_MANAGER_BUILD_MATRIX {
 variable CONNECT_BUILD_MATRIX {
     default = {
         builds = [
-            {os = "ubuntu2204", r_primary = "4.2.3", r_alternate = "4.1.3", py_primary = "3.9.17", py_alternate = "3.8.17", quarto = "1.3.340"},
+            {os = "ubuntu2204", r_primary = "4.2.3", r_alternate = "4.1.3", py_primary = "3.9.17", py_alternate = "3.8.17", quarto = DEFAULT_QUARTO_VERSION},
         ]
     }
 }
@@ -148,7 +148,6 @@ variable CONTENT_BUILD_MATRIX {
 variable R_SESSION_COMPLETE_BUILD_MATRIX {
     default = {
         builds = [
-            {os = "centos7", r_primary = "4.2.3", r_alternate = "4.1.3", py_primary = "3.9.14", py_alternate = "3.8.15"},
             {os = "ubuntu2204", r_primary = "4.2.3", r_alternate = "4.1.3", py_primary = "3.9.14", py_alternate = "3.8.15"},
         ]
     }
@@ -224,9 +223,9 @@ target "product-base" {
         "ghcr.io/rstudio/product-base:${builds.os}-r${builds.r_primary}_${builds.r_alternate}-py${builds.py_primary}_${builds.py_alternate}",
         "docker.io/rstudio/product-base:${builds.os}-r${builds.r_primary}_${builds.r_alternate}-py${builds.py_primary}_${builds.py_alternate}",
     ]
-    
+
     dockerfile = "Dockerfile.${builds.os}"
-    context = "product/base"    
+    context = "product/base"
 
     matrix = BASE_BUILD_MATRIX
     args = {
@@ -235,7 +234,7 @@ target "product-base" {
         PYTHON_VERSION = builds.py_primary
         PYTHON_VERSION_ALT = builds.py_alternate
         TINI_VERSION = "0.19.0"
-    }    
+    }
 }
 
 target "product-base-pro" {
@@ -248,7 +247,7 @@ target "product-base-pro" {
         "docker.io/rstudio/product-base-pro:${builds.os}-r${builds.r_primary}_${builds.r_alternate}-py${builds.py_primary}_${builds.py_alternate}",
     ]
 
-    dockerfile = "Dockerfile.${builds.os}"   
+    dockerfile = "Dockerfile.${builds.os}"
     context = "product/pro"
     contexts = {
         product-base = "target:product-base-${builds.os}-r${replace(builds.r_primary, ".", "-")}_${replace(builds.r_alternate, ".", "-")}-py${replace(builds.py_primary, ".", "-")}_${replace(builds.py_alternate, ".", "-")}"
@@ -400,8 +399,8 @@ target "r-session-complete" {
         PYTHON_VERSION_ALT = builds.py_alternate
         JUPYTERLAB_VERSION = DEFAULT_JUPYTERLAB_VERSION
         RSW_VERSION = WORKBENCH_VERSION
-        RSW_NAME = builds.os == "centos7" ? "rstudio-workbench-rhel" : "rstudio-workbench"
-        RSW_DOWNLOAD_URL = builds.os == "centos7" ? "https://s3.amazonaws.com/rstudio-ide-build/server/centos7/x86_64" : "https://download2.rstudio.org/server/jammy/amd64"
+        RSW_NAME = "rstudio-workbench"
+        RSW_DOWNLOAD_URL = "https://download2.rstudio.org/server/jammy/amd64"
     }
 }
 
@@ -427,7 +426,7 @@ target "workbench" {
         RSW_VERSION = WORKBENCH_VERSION
         RSW_NAME = "rstudio-workbench"
         RSW_DOWNLOAD_URL = "https://download2.rstudio.org/server/jammy/amd64"
-    }        
+    }
 }
 
 ### Workbench for Google Cloud Workstations targets ###
@@ -462,7 +461,7 @@ target "workbench-for-google-cloud-workstations" {
         RSW_VERSION = WORKBENCH_VERSION
         RSW_NAME = "rstudio-workbench"
         RSW_DOWNLOAD_URL = "https://download2.rstudio.org/server/focal/amd64"
-    } 
+    }
 }
 
 ### Workbench for Microsoft Azure ML targets ###
@@ -489,7 +488,7 @@ target "build-workbench-for-microsoft-azure-ml" {
         RSW_VERSION = WORKBENCH_VERSION
         RSW_NAME = "rstudio-workbench"
         RSW_DOWNLOAD_URL = "https://download2.rstudio.org/server/jammy/amd64"
-    } 
+    }
 }
 
 target "scan-workbench-for-microsoft-azure-ml" {

diff --git a/docker-bake.preview.hcl b/docker-bake.preview.hcl
@@ -130,7 +130,7 @@ variable PACKAGE_MANAGER_BUILD_MATRIX {
 variable CONNECT_BUILD_MATRIX {
     default = {
         builds = [
-            {os = "ubuntu2204", r_primary = "4.2.3", r_alternate = "4.1.3", py_primary = "3.11.9", py_alternate = "3.10.14", quarto = "1.3.340"},
+            {os = "ubuntu2204", r_primary = "4.2.3", r_alternate = "4.1.3", py_primary = "3.11.9", py_alternate = "3.10.14", quarto = DEFAULT_QUARTO_VERSION},
         ]
     }
 }
@@ -146,7 +146,6 @@ variable CONNECT_CONTENT_INIT_BUILD_MATRIX {
 variable R_SESSION_COMPLETE_BUILD_MATRIX {
     default = {
         builds = [
-            {os = "centos7", r_primary = "4.2.3", r_alternate = "4.1.3", py_primary = "3.11.9", py_alternate = "3.10.14"},
             {os = "ubuntu2204", r_primary = "4.2.3", r_alternate = "4.1.3", py_primary = "3.11.9", py_alternate = "3.10.14"},
         ]
     }
@@ -367,7 +366,7 @@ target "r-session-complete-daily" {
         PYTHON_VERSION_ALT = builds.py_alternate
         JUPYTERLAB_VERSION = DEFAULT_JUPYTERLAB_VERSION
         RSW_VERSION = WORKBENCH_DAILY_VERSION
-        RSW_NAME = builds.os == "centos7" ? "rstudio-workbench-rhel" : "rstudio-workbench"
+        RSW_NAME = "rstudio-workbench"
         RSW_DOWNLOAD_URL = get_rsw_download_url(builds.os)
     }
 }
@@ -393,7 +392,7 @@ target "r-session-complete-preview" {
         PYTHON_VERSION_ALT = builds.py_alternate
         JUPYTERLAB_VERSION = DEFAULT_JUPYTERLAB_VERSION
         RSW_VERSION = WORKBENCH_PREVIEW_VERSION
-        RSW_NAME = builds.os == "centos7" ? "rstudio-workbench-rhel" : "rstudio-workbench"
+        RSW_NAME = "rstudio-workbench"
         RSW_DOWNLOAD_URL = get_rsw_download_url(builds.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
-RSW_VERSION=2023.12.1+402.pro1
+RSW_VERSION=2024.04.0+735.pro3
 DRIVERS_VERSION=2024.03.0-1
diff --git a/r-session-complete/Dockerfile.centos7 b/r-session-complete/Dockerfile.centos7
diff --git a/r-session-complete/Dockerfile.ubuntu2204 b/r-session-complete/Dockerfile.ubuntu2204
@@ -6,7 +6,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.1+402.pro1
+ARG RSW_VERSION=2024.04.0+735.pro3
 ARG RSW_NAME=rstudio-workbench
 ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64
 ARG SCRIPTS_DIR=/opt/positscripts

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.1`, `ubuntu2204-2023.12.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/r-session-complete/Dockerfile.ubuntu2204)
+* [`jammy`, `ubuntu2204`, `jammy-2024.04.0`, `ubuntu2204-2024.04.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/r-session-complete/test/run_tests.sh b/r-session-complete/test/run_tests.sh
@@ -6,8 +6,6 @@ GOSS_MAX_CONCURRENT=${GOSS_MAX_CONCURRENT:-50}
 
 if [ -f /etc/debian_version ]; then
   OS="ubuntu"
-elif [ -f /etc/centos-release ]; then
-  OS="centos"
 else
   echo "OS not supported. Exiting"
   exit 1

diff --git a/tools/get-version.py b/tools/get-version.py
@@ -97,7 +97,7 @@ def clean_product_selection(product: str) -> str:
 
 
 def rstudio_workbench_daily():
-    version_json = download_json("https://dailies.rstudio.com/rstudio/chocolate-cosmos/index.json")
+    version_json = download_json("https://dailies.rstudio.com/rstudio/cranberry-hibiscus/index.json")
     return version_json['workbench']['platforms']['jammy-amd64']['version']
 
 

diff --git a/workbench-for-google-cloud-workstations/.env b/workbench-for-google-cloud-workstations/.env
@@ -1,5 +1,5 @@
-RSW_VERSION=2023.12.1+402.pro1
-RSW_TAG_VERSION=2023.12.1-402.pro1
+RSW_VERSION=2024.04.0+735.pro3
+RSW_TAG_VERSION=2024.04.0-735.pro3
 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
@@ -9,7 +9,7 @@ ARG PYTHON_VERSION_ALT=3.10.13
 ARG PYTHON_VERSION_JUPYTER=3.10.13
 ARG JUPYTERLAB_VERSION=3.6.7
 ARG DRIVERS_VERSION=2023.05.0
-ARG RSW_VERSION=2023.12.1+402.pro1
+ARG RSW_VERSION=2024.04.0+735.pro3
 ARG RSW_NAME=rstudio-workbench
 ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/focal/amd64
 ARG SCRIPTS_DIR=/opt/positscripts

diff --git a/workbench-for-microsoft-azure-ml/.env b/workbench-for-microsoft-azure-ml/.env
@@ -1,4 +1,4 @@
-RSW_VERSION=2023.12.1+402.pro1
+RSW_VERSION=2024.04.0+735.pro3
 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
@@ -7,7 +7,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.7
-ARG RSW_VERSION=2023.12.1+402.pro1
+ARG RSW_VERSION=2024.04.0+735.pro3
 ARG RSW_NAME=rstudio-workbench
 ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64
 ARG SCRIPTS_DIR=/opt/positscripts
@@ -178,5 +178,5 @@ LABEL \
      azure.ii.endpoints='[{"label":"connect","target":8787,"protocol":"http"}]' \
      org.opencontainers.image.description='A professional integrated development environment for data science teams using R and Python' \
      org.opencontainers.image.title='RStudio Workbench' \
-     org.opencontainers.image.version='2023.06.2+561.pro5' \
+     org.opencontainers.image.version='2024.04.0+735.pro3' \
      org.opencontainers.image.url='https://www.rstudio.com/products/workbench/'