Skip to content

Commit

Permalink
Merge branch 'dev' into workbench-session-init-release-build
Browse files Browse the repository at this point in the history
  • Loading branch information
@bschwedler
bschwedler authored Nov 6, 2024
2 parents 3f4580d + c9f1c14 commit 7f2f366
Show file tree
Hide file tree
Showing 26 changed files with 50 additions and 18 deletions.
2 changes: 1 addition & 1 deletion Justfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion docker-bake.hcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ variable PACKAGE_MANAGER_VERSION {
}

variable WORKBENCH_VERSION {
default = "2024.09.0+375.pro3"
default = "2024.09.1+394.pro7"
}

variable WORKBENCH_SESSION_INIT_VERSION {
Expand Down
2 changes: 1 addition & 1 deletion r-session-complete/.env
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion r-session-complete/Dockerfile.ubuntu2204
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion r-session-complete/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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?

Expand Down
2 changes: 2 additions & 0 deletions r-session-complete/positron.extensions.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
posit.shiny
posit.publisher
4 changes: 2 additions & 2 deletions workbench-for-google-cloud-workstations/.env
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions workbench-for-google-cloud-workstations/conf/positron-user-settings.json
View file
Original file line number Diff line number Diff line change
@@ -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"
}
2 changes: 2 additions & 0 deletions workbench-for-google-cloud-workstations/conf/positron.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
enabled=1
exe=/usr/lib/rstudio-server/bin/positron-server/bin/positron-server
2 changes: 2 additions & 0 deletions workbench-for-google-cloud-workstations/conf/positron.extensions.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
posit.shiny
posit.publisher
2 changes: 1 addition & 1 deletion workbench-for-google-cloud-workstations/conf/vscode-user-settings.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"terminal.integrated.shell.linux": "/bin/bash",
"terminal.integrated.defaultProfile.linux": "bash",
"extensions.autoUpdate": false,
"extensions.autoCheckUpdates": false
}
2 changes: 1 addition & 1 deletion workbench-for-microsoft-azure-ml/.env
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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/'
6 changes: 6 additions & 0 deletions workbench-for-microsoft-azure-ml/conf/positron-user-settings.json
View file
Original file line number Diff line number Diff line change
@@ -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"
}
2 changes: 2 additions & 0 deletions workbench-for-microsoft-azure-ml/conf/positron.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
enabled=1
exe=/usr/lib/rstudio-server/bin/positron-server/bin/positron-server
2 changes: 2 additions & 0 deletions workbench-for-microsoft-azure-ml/conf/positron.extensions.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
posit.shiny
posit.publisher
2 changes: 1 addition & 1 deletion workbench-for-microsoft-azure-ml/conf/vscode-user-settings.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"terminal.integrated.shell.linux": "/bin/bash",
"terminal.integrated.defaultProfile.linux": "bash",
"extensions.autoUpdate": false,
"extensions.autoCheckUpdates": false
}
2 changes: 1 addition & 1 deletion workbench-session-init/Dockerfile.ubuntu2204
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
2 changes: 1 addition & 1 deletion workbench/.env
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion workbench/Dockerfile.ubuntu2204
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion workbench/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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?

Expand Down
6 changes: 6 additions & 0 deletions workbench/conf/positron-user-settings.json
View file
Original file line number Diff line number Diff line change
@@ -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"
}
2 changes: 2 additions & 0 deletions workbench/conf/positron.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
enabled=1
exe=/usr/lib/rstudio-server/bin/positron-server/bin/positron-server
2 changes: 2 additions & 0 deletions workbench/conf/positron.extensions.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
posit.shiny
posit.publisher
2 changes: 1 addition & 1 deletion workbench/conf/vscode-user-settings.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"terminal.integrated.shell.linux": "/bin/bash",
"terminal.integrated.defaultProfile.linux": "bash",
"extensions.autoUpdate": false,
"extensions.autoCheckUpdates": false
}

0 comments on commit 7f2f366

Please sign in to comment.