From 958e3cf6e403636e56c45c43300c1de986d54424 Mon Sep 17 00:00:00 2001 From: Melissa Barca <5323711+melissa-barca@users.noreply.github.com> Date: Mon, 4 Nov 2024 15:00:10 -0500 Subject: [PATCH 1/2] add positron config files and fix vs code default setting --- r-session-complete/positron.extensions.conf | 2 ++ .../conf/positron-user-settings.json | 6 ++++++ workbench-for-google-cloud-workstations/conf/positron.conf | 2 ++ .../conf/positron.extensions.conf | 2 ++ .../conf/vscode-user-settings.json | 2 +- .../conf/positron-user-settings.json | 6 ++++++ workbench-for-microsoft-azure-ml/conf/positron.conf | 2 ++ .../conf/positron.extensions.conf | 2 ++ .../conf/vscode-user-settings.json | 2 +- workbench/conf/positron-user-settings.json | 6 ++++++ workbench/conf/positron.conf | 2 ++ workbench/conf/positron.extensions.conf | 2 ++ workbench/conf/vscode-user-settings.json | 2 +- 13 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 r-session-complete/positron.extensions.conf create mode 100644 workbench-for-google-cloud-workstations/conf/positron-user-settings.json create mode 100644 workbench-for-google-cloud-workstations/conf/positron.conf create mode 100644 workbench-for-google-cloud-workstations/conf/positron.extensions.conf create mode 100644 workbench-for-microsoft-azure-ml/conf/positron-user-settings.json create mode 100644 workbench-for-microsoft-azure-ml/conf/positron.conf create mode 100644 workbench-for-microsoft-azure-ml/conf/positron.extensions.conf create mode 100644 workbench/conf/positron-user-settings.json create mode 100644 workbench/conf/positron.conf create mode 100644 workbench/conf/positron.extensions.conf diff --git a/r-session-complete/positron.extensions.conf b/r-session-complete/positron.extensions.conf new file mode 100644 index 000000000..42191cc92 --- /dev/null +++ b/r-session-complete/positron.extensions.conf @@ -0,0 +1,2 @@ +posit.shiny +posit.publisher diff --git a/workbench-for-google-cloud-workstations/conf/positron-user-settings.json b/workbench-for-google-cloud-workstations/conf/positron-user-settings.json new file mode 100644 index 000000000..1a8a2a71e --- /dev/null +++ b/workbench-for-google-cloud-workstations/conf/positron-user-settings.json @@ -0,0 +1,6 @@ +{ + "terminal.integrated.defaultProfile.linux": "bash", + "extensions.autoUpdate": false, + "extensions.autoCheckUpdates": false, + "quarto.path": "/usr/lib/rstudio-server/bin/quarto/bin/quarto" +} diff --git a/workbench-for-google-cloud-workstations/conf/positron.conf b/workbench-for-google-cloud-workstations/conf/positron.conf new file mode 100644 index 000000000..9da434932 --- /dev/null +++ b/workbench-for-google-cloud-workstations/conf/positron.conf @@ -0,0 +1,2 @@ +enabled=1 +exe=/usr/lib/rstudio-server/bin/positron-server/bin/positron-server diff --git a/workbench-for-google-cloud-workstations/conf/positron.extensions.conf b/workbench-for-google-cloud-workstations/conf/positron.extensions.conf new file mode 100644 index 000000000..42191cc92 --- /dev/null +++ b/workbench-for-google-cloud-workstations/conf/positron.extensions.conf @@ -0,0 +1,2 @@ +posit.shiny +posit.publisher diff --git a/workbench-for-google-cloud-workstations/conf/vscode-user-settings.json b/workbench-for-google-cloud-workstations/conf/vscode-user-settings.json index 144b8c2ad..4f0b03ccb 100644 --- a/workbench-for-google-cloud-workstations/conf/vscode-user-settings.json +++ b/workbench-for-google-cloud-workstations/conf/vscode-user-settings.json @@ -1,5 +1,5 @@ { - "terminal.integrated.shell.linux": "/bin/bash", + "terminal.integrated.defaultProfile.linux": "bash", "extensions.autoUpdate": false, "extensions.autoCheckUpdates": false } diff --git a/workbench-for-microsoft-azure-ml/conf/positron-user-settings.json b/workbench-for-microsoft-azure-ml/conf/positron-user-settings.json new file mode 100644 index 000000000..1a8a2a71e --- /dev/null +++ b/workbench-for-microsoft-azure-ml/conf/positron-user-settings.json @@ -0,0 +1,6 @@ +{ + "terminal.integrated.defaultProfile.linux": "bash", + "extensions.autoUpdate": false, + "extensions.autoCheckUpdates": false, + "quarto.path": "/usr/lib/rstudio-server/bin/quarto/bin/quarto" +} diff --git a/workbench-for-microsoft-azure-ml/conf/positron.conf b/workbench-for-microsoft-azure-ml/conf/positron.conf new file mode 100644 index 000000000..9da434932 --- /dev/null +++ b/workbench-for-microsoft-azure-ml/conf/positron.conf @@ -0,0 +1,2 @@ +enabled=1 +exe=/usr/lib/rstudio-server/bin/positron-server/bin/positron-server diff --git a/workbench-for-microsoft-azure-ml/conf/positron.extensions.conf b/workbench-for-microsoft-azure-ml/conf/positron.extensions.conf new file mode 100644 index 000000000..42191cc92 --- /dev/null +++ b/workbench-for-microsoft-azure-ml/conf/positron.extensions.conf @@ -0,0 +1,2 @@ +posit.shiny +posit.publisher diff --git a/workbench-for-microsoft-azure-ml/conf/vscode-user-settings.json b/workbench-for-microsoft-azure-ml/conf/vscode-user-settings.json index 144b8c2ad..4f0b03ccb 100644 --- a/workbench-for-microsoft-azure-ml/conf/vscode-user-settings.json +++ b/workbench-for-microsoft-azure-ml/conf/vscode-user-settings.json @@ -1,5 +1,5 @@ { - "terminal.integrated.shell.linux": "/bin/bash", + "terminal.integrated.defaultProfile.linux": "bash", "extensions.autoUpdate": false, "extensions.autoCheckUpdates": false } diff --git a/workbench/conf/positron-user-settings.json b/workbench/conf/positron-user-settings.json new file mode 100644 index 000000000..1a8a2a71e --- /dev/null +++ b/workbench/conf/positron-user-settings.json @@ -0,0 +1,6 @@ +{ + "terminal.integrated.defaultProfile.linux": "bash", + "extensions.autoUpdate": false, + "extensions.autoCheckUpdates": false, + "quarto.path": "/usr/lib/rstudio-server/bin/quarto/bin/quarto" +} diff --git a/workbench/conf/positron.conf b/workbench/conf/positron.conf new file mode 100644 index 000000000..9da434932 --- /dev/null +++ b/workbench/conf/positron.conf @@ -0,0 +1,2 @@ +enabled=1 +exe=/usr/lib/rstudio-server/bin/positron-server/bin/positron-server diff --git a/workbench/conf/positron.extensions.conf b/workbench/conf/positron.extensions.conf new file mode 100644 index 000000000..42191cc92 --- /dev/null +++ b/workbench/conf/positron.extensions.conf @@ -0,0 +1,2 @@ +posit.shiny +posit.publisher diff --git a/workbench/conf/vscode-user-settings.json b/workbench/conf/vscode-user-settings.json index 144b8c2ad..4f0b03ccb 100644 --- a/workbench/conf/vscode-user-settings.json +++ b/workbench/conf/vscode-user-settings.json @@ -1,5 +1,5 @@ { - "terminal.integrated.shell.linux": "/bin/bash", + "terminal.integrated.defaultProfile.linux": "bash", "extensions.autoUpdate": false, "extensions.autoCheckUpdates": false } From 78d7404bae563942e06b02c063d10feb5deddd98 Mon Sep 17 00:00:00 2001 From: Skye Turriff Date: Tue, 5 Nov 2024 13:11:18 -0500 Subject: [PATCH 2/2] bump workbench to 2024.09.1 --- Justfile | 2 +- docker-bake.hcl | 2 +- r-session-complete/.env | 2 +- r-session-complete/Dockerfile.ubuntu2204 | 2 +- r-session-complete/README.md | 2 +- workbench-for-google-cloud-workstations/.env | 4 ++-- workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204 | 2 +- workbench-for-microsoft-azure-ml/.env | 2 +- workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204 | 4 ++-- workbench-session-init/Dockerfile.ubuntu2204 | 2 +- workbench/.env | 2 +- workbench/Dockerfile.ubuntu2204 | 2 +- workbench/README.md | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Justfile b/Justfile index 1cda2d0ca..222783200 100644 --- a/Justfile +++ b/Justfile @@ -9,7 +9,7 @@ BUILDX_PATH := "" RSC_VERSION := "2024.09.0" RSPM_VERSION := "2024.08.2-9" -RSW_VERSION := "2024.09.0+375.pro3" +RSW_VERSION := "2024.09.1+394.pro7" DRIVERS_VERSION := "2023.05.0" DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1" diff --git a/docker-bake.hcl b/docker-bake.hcl index 090a157ec..24be958de 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -8,7 +8,7 @@ variable PACKAGE_MANAGER_VERSION { } variable WORKBENCH_VERSION { - default = "2024.09.0+375.pro3" + default = "2024.09.1+394.pro7" } variable DRIVERS_VERSION { diff --git a/r-session-complete/.env b/r-session-complete/.env index 8ba538cd6..5138f0570 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 -RSW_VERSION=2024.09.0+375.pro3 +RSW_VERSION=2024.09.1+394.pro7 DRIVERS_VERSION=2024.03.0-1 diff --git a/r-session-complete/Dockerfile.ubuntu2204 b/r-session-complete/Dockerfile.ubuntu2204 index 62a18b6ce..95b043860 100644 --- 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.09.0+375.pro3 +ARG RSW_VERSION=2024.09.1+394.pro7 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 index 20381c600..243c17d1b 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-2024.09.0`, `ubuntu2204-2024.09.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/r-session-complete/Dockerfile.ubuntu2204) +* [`jammy`, `ubuntu2204`, `jammy-2024.09.1`, `ubuntu2204-2024.09.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 index 238825926..d4ade501b 100644 --- a/workbench-for-google-cloud-workstations/.env +++ b/workbench-for-google-cloud-workstations/.env @@ -1,5 +1,5 @@ -RSW_VERSION=2024.09.0+375.pro3 -RSW_TAG_VERSION=2024.09.0-375.pro3 +RSW_VERSION=2024.09.1+394.pro7 +RSW_TAG_VERSION=2024.09.1-394.pro7 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 index aa76f97a5..aaa7513f0 100644 --- a/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204 +++ b/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.09.0+375.pro3 +ARG RSW_VERSION=2024.09.1+394.pro7 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 index 8ed04719c..b7c6d840e 100644 --- a/workbench-for-microsoft-azure-ml/.env +++ b/workbench-for-microsoft-azure-ml/.env @@ -1,4 +1,4 @@ -RSW_VERSION=2024.09.0+375.pro3 +RSW_VERSION=2024.09.1+394.pro7 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 bb6fd7656..37c647746 100644 --- 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.09.0+375.pro3 +ARG RSW_VERSION=2024.09.1+394.pro7 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.09.0+375.pro3' \ + org.opencontainers.image.version='2024.09.1+394.pro7' \ org.opencontainers.image.url='https://www.rstudio.com/products/workbench/' diff --git a/workbench-session-init/Dockerfile.ubuntu2204 b/workbench-session-init/Dockerfile.ubuntu2204 index 0ccfb3cc7..2d0bbc449 100644 --- a/workbench-session-init/Dockerfile.ubuntu2204 +++ b/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.09.0+375.pro3 +ARG RSW_VERSION=2024.09.1+394.pro7 SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN mkdir -p /pwb-staging && \ diff --git a/workbench/.env b/workbench/.env index 2c1af1c85..1667c4046 100644 --- a/workbench/.env +++ b/workbench/.env @@ -1,4 +1,4 @@ -RSW_VERSION=2024.09.0+375.pro3 +RSW_VERSION=2024.09.1+394.pro7 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 3a64b9de8..e637a53bb 100644 --- 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.09.0+375.pro3 +ARG RSW_VERSION=2024.09.1+394.pro7 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 index 3b36732e5..97da82f5a 100644 --- a/workbench/README.md +++ b/workbench/README.md @@ -7,7 +7,7 @@ # Supported tags and respective Dockerfile links -* [`jammy`, `ubuntu2204`, `jammy-2024.09.0`, `ubuntu2204-2024.09.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/workbench/Dockerfile.ubuntu2204) +* [`jammy`, `ubuntu2204`, `jammy-2024.09.1`, `ubuntu2204-2024.09.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/workbench/Dockerfile.ubuntu2204) # What is RStudio Workbench?