Merge pull request #920 from rstudio/dev

Promote dev to main

Author: bschwedler

Justfile

@@ -9,7 +9,7 @@ BUILDX_PATH := ""
 
 RSC_VERSION := "2025.04.0"
 RSPM_VERSION := "2025.04.0-4"
-RSW_VERSION := "2024.12.1+563.pro5"
+RSW_VERSION := "2025.05.0+496.pro5"
 
 DRIVERS_VERSION := "2023.05.0"
 DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1"

docker-bake.hcl

@@ -8,7 +8,7 @@ variable PACKAGE_MANAGER_VERSION {
 }
 
 variable WORKBENCH_VERSION {
-    default = "2024.12.1+563.pro5"
+    default = "2025.05.0+496.pro5"
 }
 
 variable DRIVERS_VERSION {
@@ -456,7 +456,7 @@ target "workbench-session" {
     contexts = {
         product-base-pro = "target:product-base-pro-${builds.os}-r${replace(builds.r_primary, ".", "-")}_${replace(builds.r_alternate, ".", "-")}-py${replace(builds.py_primary, ".", "-")}_${replace(builds.py_alternate, ".", "-")}"
     }
-    
+
     matrix = WORKBENCH_SESSION_MATRIX
     args = {
         R_VERSION = builds.r_primary

r-session-complete/.env

@@ -1,4 +1,4 @@
-R_VERSION=4.1.0
+R_VERSION=4.4.0
 PYTHON_VERSION=3.9.5
-RSW_VERSION=2024.12.1+563.pro5
+RSW_VERSION=2025.05.0+496.pro5
 DRIVERS_VERSION=2024.03.0-1

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.12.1+563.pro5
+ARG RSW_VERSION=2025.05.0+496.pro5
 ARG RSW_NAME=rstudio-workbench
 ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64
 ARG SCRIPTS_DIR=/opt/positscripts

r-session-complete/README.md

@@ -7,13 +7,13 @@
 
 # Supported tags and respective Dockerfile links
 
-* [`jammy`, `ubuntu2204`, `jammy-2024.12.1`, `ubuntu2204-2024.12.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/r-session-complete/Dockerfile.ubuntu2204)
+* [`jammy`, `ubuntu2204`, `jammy-2025.05.0`, `ubuntu2204-2025.05.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/r-session-complete/Dockerfile.ubuntu2204)
 
 # What are the r-session-complete images?
 
 Images for R and Python sessions and jobs to be used RStudio Workbench, Launcher, and Kubernetes.
 
-# Notice for support 
+# Notice for support
 
 1. This image may introduce **BREAKING** changes; as such we recommend:
    - Avoid using the `{operating-system}` tags to avoid unexpected version changes, and
@@ -47,7 +47,7 @@ Launcher, refer to the RStudio support article on [Using Docker images with
 RStudio Workbench, Launcher, and
 Kubernetes](https://support.rstudio.com/hc/en-us/articles/360019253393-Using-Docker-images-with-RStudio-Server-Pro-Launcher-and-Kubernetes).
 
-We provide simple ways to extend and build the Dockerfiles. After you have cloned the repo, you can create your own 
+We provide simple ways to extend and build the Dockerfiles. After you have cloned the repo, you can create your own
 containers fairly simply with the provided Justfile.
 
 ## Overview

workbench-for-google-cloud-workstations/.env

@@ -1,4 +1,4 @@
-RSW_VERSION=2024.12.1+563.pro5
+RSW_VERSION=2025.05.0+496.pro5
 RSW_TAG_VERSION=2024.12.1-563.pro5
 RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64
 RSW_NAME=rstudio-workbench

workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204

@@ -10,7 +10,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.12.1+563.pro5
+ARG RSW_VERSION=2025.05.0+496.pro5
 ARG RSW_NAME=rstudio-workbench
 ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64
 ARG SCRIPTS_DIR=/opt/positscripts

workbench-for-microsoft-azure-ml/.env

@@ -1,4 +1,4 @@
-RSW_VERSION=2024.12.1+563.pro5
+RSW_VERSION=2025.05.0+496.pro5
 RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/bionic/amd64
 RSW_NAME=rstudio-workbench
 PYTHON_VERSION=3.9.14

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.12.1+563.pro5
+ARG RSW_VERSION=2025.05.0+496.pro5
 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.12.1+563.pro5' \
+     org.opencontainers.image.version='2025.05.0+496.pro5' \
      org.opencontainers.image.url='https://www.rstudio.com/products/workbench/'

workbench-session-init/Dockerfile.ubuntu2204

@@ -8,7 +8,7 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends ca-certificates curl && \
     rm -rf /var/lib/apt/lists/*
 
-ARG RSW_VERSION=2024.12.1+563.pro5
+ARG RSW_VERSION=2025.05.0+496.pro5
 ARG GO_VERSION=1.22.2
 
 # Download the RStudio Workbench session components and install Go

workbench-session-init/README.md

@@ -12,7 +12,7 @@ This directory contains a Dockerfile and script that will create an init contain
 
 ## Supported tags and respective Dockerfile links
 
-* [`jammy-daily`, `ubuntu2204-daily`, `jammy-2024.12.1`, `ubuntu2204-2024.12.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/workbench-session-init/Dockerfile.2204)
+* [`jammy-daily`, `ubuntu2204-daily`, `jammy-2025.05.0`, `ubuntu2204-2025.05.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/workbench-session-init/Dockerfile.2204)
 
 ## Building
 
@@ -34,7 +34,7 @@ You can observe what gets copied by the container:
 
 ```console
 mkdir init
-docker run --rm -v $(pwd)/init:/mnt/init rstudio/workbench-session-init:jammy-2024.12.1
+docker run --rm -v $(pwd)/init:/mnt/init rstudio/workbench-session-init:jammy-2025.05.0
 # The init directory has been populated with the Workbench session runtime components.
 ```
 

workbench-session-init/entrypoint/main.go

@@ -19,24 +19,19 @@ var (
 	// Read the PWB_SESSION_TYPE environment variable
 	sessionType = os.Getenv("PWB_SESSION_TYPE")
 
-	// Set the copy options.
-	// Preserve permissions, times, and owner.
-	opt = cp.Options{
-		PermissionControl: cp.PerservePermission,
-		PreserveTimes:     true,
-		PreserveOwner:     true,
-		NumOfWorkers:      20,
+	// List of dependencies common to all environments
+	commonDeps = []string{
+		"bin/pwb-supervisor",
 	}
 
 	// List of dependencies common to all session types
-	commonDeps = []string{
+	commonSessionDeps = append([]string{
 		"bin/git-credential-pwb",
 		"bin/focal",
 		"bin/jammy",
 		"bin/noble",
 		"bin/opensuse15",
 		"bin/postback",
-		"bin/pwb-supervisor",
 		"bin/quarto",
 		"bin/r-ldpath",
 		"bin/rhel8",
@@ -46,32 +41,47 @@ var (
 		"resources",
 		"www",
 		"www-symbolmaps",
-	}
+	}, commonDeps...)
 
 	// Map of session-specific dependencies
 	sessionDeps = map[string][]string{
-		"jupyter": {
+		"jupyter": append([]string{
 			"bin/jupyter-session-run",
-			"bin/node",
 			"extras",
-		},
-		"positron": {
+		}, commonSessionDeps...),
+		"positron": append([]string{
 			"bin/positron-server",
 			"bin/positron-session-run",
 			"extras",
-		},
-		"rstudio": {
-			"bin/node",
+		}, commonSessionDeps...),
+		"rstudio": append([]string{
 			"bin/rsession-run",
-		},
-		"vscode": {
+			"bin/copilot-language-server",
+		}, commonSessionDeps...),
+		"vscode": append([]string{
 			"bin/pwb-code-server",
 			"bin/vscode-session-run",
 			"extras",
-		},
+		}, commonSessionDeps...),
+		"adhoc": commonDeps,
 	}
 )
 
+func createCopyOptions(sessionType string) cp.Options {
+	// adhoc sessions init container does not run as root so it can't preserve the owner.
+	var preserveOwner bool = true
+	if sessionType == "adhoc" {
+		preserveOwner = false
+	} 
+
+	return cp.Options{
+		PermissionControl: cp.PerservePermission,
+		PreserveTimes:     true,
+		PreserveOwner:     preserveOwner,
+		NumOfWorkers:      20,
+	}
+}
+
 func main() {
 	if sessionType == "" {
 		fmt.Println("PWB_SESSION_TYPE environment variable is not set")
@@ -96,7 +106,8 @@ func main() {
 		os.Exit(1)
 	}
 
-	err = copyFiles(sourceDir, targetDir, filesToCopy)
+	opt := createCopyOptions(sessionType)
+	err = copyFiles(sourceDir, targetDir, filesToCopy, opt)
 	if err != nil {
 		fmt.Println(err)
 		os.Exit(1)
@@ -106,13 +117,11 @@ func main() {
 
 // getFilesToCopy returns the list of files to copy based on the session type.
 func getFilesToCopy(sessionType string) ([]string, error) {
-	files := commonDeps
 	if deps, ok := sessionDeps[sessionType]; ok {
-		files = append(files, deps...)
+		return deps, nil
 	} else {
 		return nil, fmt.Errorf("unknown session type: %s", sessionType)
 	}
-	return files, nil
 }
 
 // validateTargetDir checks if the target directory exists and is empty.
@@ -150,7 +159,7 @@ func isDirEmpty(dir string) (bool, error) {
 // copyFiles copies the files from the source directory to the target directory.
 // It uses the otiai10/copy package to copy files, with options to preserve
 // permissions, times, and owner.
-func copyFiles(src, dst string, filesToCopy []string) error {
+func copyFiles(src, dst string, filesToCopy []string, opt cp.Options) error {
 	fmt.Printf("Copying files from %s to %s\n", src, dst)
 	start := time.Now()
 

workbench-session-init/entrypoint/main_test.go

@@ -16,22 +16,27 @@ func TestGetFilesToCopy(t *testing.T) {
 	}{
 		{
 			sessionType: "jupyter",
-			expected:    append(commonDeps, sessionDeps["jupyter"]...),
+			expected:    sessionDeps["jupyter"],
 			expectError: false,
 		},
 		{
 			sessionType: "positron",
-			expected:    append(commonDeps, sessionDeps["positron"]...),
+			expected:    sessionDeps["positron"],
 			expectError: false,
 		},
 		{
 			sessionType: "rstudio",
-			expected:    append(commonDeps, sessionDeps["rstudio"]...),
+			expected:    sessionDeps["rstudio"],
 			expectError: false,
 		},
 		{
 			sessionType: "vscode",
-			expected:    append(commonDeps, sessionDeps["vscode"]...),
+			expected:    sessionDeps["vscode"],
+			expectError: false,
+		},
+		{
+			sessionType: "adhoc",
+			expected:    commonDeps,
 			expectError: false,
 		},
 		{

workbench-session-init/test/goss.yaml

@@ -11,3 +11,92 @@ file:
     exists: true
     filetype: file
     mode: "0755"
+  # Should encompass commonDeps and sessionDeps listed in main.go
+  /opt/session-components/bin/git-credential-pwb:
+    exists: true
+    filetype: file
+    mode: "0755"
+  /opt/session-components/bin/jammy:
+    exists: true
+    filetype: directory
+    mode: "0755"
+  /opt/session-components/bin/noble:
+    exists: true
+    filetype: directory
+    mode: "0755"
+  /opt/session-components/bin/opensuse15:
+    exists: true
+    filetype: directory
+    mode: "0755"
+  /opt/session-components/bin/postback:
+    exists: true
+    filetype: directory
+    mode: "0755"
+  /opt/session-components/bin/pwb-supervisor:
+    exists: true
+    filetype: file
+    mode: "0755"
+  /opt/session-components/bin/quarto:
+    exists: true
+    filetype: directory
+    mode: "0755"
+  /opt/session-components/bin/r-ldpath:
+    exists: true
+    filetype: file
+    mode: "0755"
+  /opt/session-components/bin/rhel8:
+    exists: true
+    filetype: directory
+    mode: "0755"
+  /opt/session-components/bin/rhel9:
+    exists: true
+    filetype: directory
+    mode: "0755"
+  /opt/session-components/bin/shared-run:
+    exists: true
+    filetype: file
+    mode: "0755"
+  /opt/session-components/R:
+    exists: true
+    filetype: directory
+    mode: "0755"
+  /opt/session-components/resources:
+    exists: true
+    filetype: directory
+    mode: "0755"
+  /opt/session-components/www:
+    exists: true
+    filetype: directory
+    mode: "0755"
+  /opt/session-components/www-symbolmaps:
+    exists: true
+    filetype: directory
+    mode: "0755"
+  /opt/session-components/bin/jupyter-session-run:
+    exists: true
+    filetype: file
+    mode: "0755"
+  /opt/session-components/extras:
+    exists: true
+    filetype: directory
+    mode: "0755"
+  /opt/session-components/bin/positron-server:
+    exists: true
+    filetype: directory
+    mode: "0755"
+  /opt/session-components/bin/positron-session-run:
+    exists: true
+    filetype: file
+    mode: "0755"
+  /opt/session-components/bin/rsession-run:
+    exists: true
+    filetype: file
+    mode: "0755"
+  /opt/session-components/bin/pwb-code-server:
+    exists: true
+    filetype: directory
+    mode: "0755"
+  /opt/session-components/bin/vscode-session-run:
+    exists: true
+    filetype: file
+    mode: "0755"

workbench/.env

@@ -1,8 +1,8 @@
-RSW_VERSION=2024.12.1+563.pro5
-RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/bionic/amd64
+RSW_VERSION=2025.05.0+496.pro5
+RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64
 RSW_NAME=rstudio-workbench
 PYTHON_VERSION=3.9.17
 PYTHON_VERSION_ALT=3.8.17
 PYTHON_VERSION_JUPYTER=3.8.17
 R_VERSION_ALT=4.1.3
-R_VERSION=4.2.3
+R_VERSION=4.4.0