Merge pull request #798 from rstudio/dev

Merge dev to main
rstudio · Jun 17, 2024 · 59ebe4d · 59ebe4d
2 parents 5b2a53a + 3718640
commit 59ebe4d
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 19 deletions.
diff --git a/Justfile b/Justfile
@@ -7,9 +7,9 @@ sed_vars := if os() == "macos" { "-i ''" } else { "-i" }
 
 BUILDX_PATH := ""
 
-RSC_VERSION := "2024.05.0"
+RSC_VERSION := "2024.04.1"
 RSPM_VERSION := "2024.04.2-29"
-RSW_VERSION := "2024.04.1+748.pro2"
+RSW_VERSION := "2024.04.2+764.pro1"
 
 DRIVERS_VERSION := "2023.05.0"
 DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1"

diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -8,7 +8,7 @@ variable PACKAGE_MANAGER_VERSION {
 }
 
 variable WORKBENCH_VERSION {
-    default = "2024.04.1+748.pro2"
+    default = "2024.04.2+764.pro1"
 }
 
 variable DRIVERS_VERSION {

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=2024.04.1+748.pro2
+RSW_VERSION=2024.04.2+764.pro1
 DRIVERS_VERSION=2024.03.0-1
diff --git a/r-session-complete/Dockerfile.ubuntu2204 b/r-session-complete/Dockerfile.ubuntu2204
@@ -6,7 +6,7 @@ ARG R_VERSION_ALT=4.3.3
 ARG PYTHON_VERSION=3.9.17
 ARG PYTHON_VERSION_ALT=3.8.17
 ARG JUPYTERLAB_VERSION=3.6.5
-ARG RSW_VERSION=2024.04.1+748.pro2
+ARG RSW_VERSION=2024.04.2+764.pro1
 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-2024.04.1`, `ubuntu2204-2024.04.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/r-session-complete/Dockerfile.ubuntu2204)
+* [`jammy`, `ubuntu2204`, `jammy-2024.04.2`, `ubuntu2204-2024.04.2`](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/goss.yaml b/r-session-complete/test/goss.yaml
@@ -6,8 +6,8 @@ file:
   /usr/local/bin/jupyter:
     exists: true
   {{ $version_split := split "." .Env.RSW_VERSION }}
-  {{ if or (lt ($version_split._0 | atoi) 2022) (and (eq ($version_split._0 | atoi) 2022) (lt ($version_split._1 | atoi) 12)) }}
-  /opt/code-server/bin/code-server:
+  {{ if or (ge ($version_split._0 | atoi) 2025) (and (ge ($version_split._0 | atoi) 2024) (ge ($version_split._1 | atoi) 7)) }}
+  /usr/lib/rstudio-server/bin/pwb-code-server/bin/code-server:
     exists: true
   {{ else }}
   /usr/lib/rstudio-server/bin/code-server/bin/code-server:

diff --git a/workbench-for-google-cloud-workstations/.env b/workbench-for-google-cloud-workstations/.env
@@ -1,5 +1,5 @@
-RSW_VERSION=2024.04.1+748.pro2
-RSW_TAG_VERSION=2024.04.1-748.pro2
+RSW_VERSION=2024.04.2+764.pro1
+RSW_TAG_VERSION=2024.04.2-764.pro1
 RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64
 RSW_NAME=rstudio-workbench
 PYTHON_VERSION=3.11.9

diff --git a/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204 b/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204
@@ -9,7 +9,7 @@ ARG PYTHON_VERSION_ALT=3.10.14
 ARG PYTHON_VERSION_JUPYTER=3.10.14
 ARG JUPYTERLAB_VERSION=3.6.7
 ARG DRIVERS_VERSION=2023.05.0
-ARG RSW_VERSION=2024.04.1+748.pro2
+ARG RSW_VERSION=2024.04.2+764.pro1
 ARG RSW_NAME=rstudio-workbench
 ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/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=2024.04.1+748.pro2
+RSW_VERSION=2024.04.2+764.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
@@ -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=2024.04.1+748.pro2
+ARG RSW_VERSION=2024.04.2+764.pro1
 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='2024.04.1+748.pro2' \
+     org.opencontainers.image.version='2024.04.2+764.pro1' \
      org.opencontainers.image.url='https://www.rstudio.com/products/workbench/'
diff --git a/workbench/.env b/workbench/.env
@@ -1,4 +1,4 @@
-RSW_VERSION=2024.04.1+748.pro2
+RSW_VERSION=2024.04.2+764.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
@@ -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=2024.04.1+748.pro2
+ARG RSW_VERSION=2024.04.2+764.pro1
 ARG RSW_NAME=rstudio-workbench
 ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64
 ARG SCRIPTS_DIR=/opt/positscripts

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

diff --git a/workbench/test/goss.yaml b/workbench/test/goss.yaml
@@ -70,8 +70,8 @@ file:
     owner: rstudio-server
     group: rstudio-server
   {{ $version_split := split "." .Env.RSW_VERSION }}
-  {{ if or (lt ($version_split._0 | atoi) 2022) (and (eq ($version_split._0 | atoi) 2022) (lt ($version_split._1 | atoi) 12)) }}
-  /opt/code-server/bin/code-server:
+  {{ if or (ge ($version_split._0 | atoi) 2025) (and (ge ($version_split._0 | atoi) 2024) (ge ($version_split._1 | atoi) 7)) }}
+  /usr/lib/rstudio-server/bin/pwb-code-server/bin/code-server:
     exists: true
   {{ else }}
   /usr/lib/rstudio-server/bin/code-server/bin/code-server: