Skip to content

Commit

Permalink
Bump Workbench and rsession images to 2023.12.0 (#678)
Browse files Browse the repository at this point in the history
  • Loading branch information
timtmok authored Dec 20, 2023
1 parent 6239204 commit 1d65c5b
Show file tree
Hide file tree
Showing 17 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ BUILDX_PATH := ""

RSC_VERSION := "2023.12.0"
RSPM_VERSION := "2023.08.4-20"
RSW_VERSION := "2023.09.1+494.pro2"
RSW_VERSION := "2023.12.0+369.pro3"

DRIVERS_VERSION := "2023.05.0"
DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1"
Expand All @@ -21,7 +21,7 @@ PYTHON_VERSION_ALT := "3.8.17"
PYTHON_VERSION_RHEL := "3.9.14"
PYTHON_VERSION_ALT_RHEL := "3.8.15"

QUARTO_VERSION := "1.3.340"
QUARTO_VERSION := "1.3.450"

# just _get-tag-safe-version 2022.07.2+576.pro12
_get-tag-safe-version $VERSION:
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ services:
context: ./workbench
dockerfile: "Dockerfile.${IMAGE_OS:-ubuntu2204}"
args:
RSW_VERSION: 2023.09.1+494.pro2
image: rstudio/rstudio-workbench:2023.09.1
RSW_VERSION: 2023.12.0+369.pro3
image: rstudio/rstudio-workbench:2023.12.0
environment:
RSW_LICENSE: ${RSW_LICENSE}
LICENSE_SERVER: ${RSW_LICENSE_SERVER}
Expand Down
2 changes: 1 addition & 1 deletion r-session-complete/.env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
R_VERSION=4.1.0
PYTHON_VERSION=3.9.5
DRIVERS_VERSION=2023.05.0-1
RSW_VERSION=2023.09.1+494.pro2
RSW_VERSION=2023.12.0+369.pro3
2 changes: 1 addition & 1 deletion r-session-complete/Dockerfile.centos7
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ARG R_VERSION_ALT=4.1.3
ARG PYTHON_VERSION=3.9.14
ARG PYTHON_VERSION_ALT=3.8.15
ARG JUPYTERLAB_VERSION=3.2.9
ARG RSW_VERSION=2023.09.1+494.pro2
ARG RSW_VERSION=2023.12.0+369.pro3
ARG RSW_NAME=rstudio-workbench-rhel
ARG RSW_DOWNLOAD_URL=https://s3.amazonaws.com/rstudio-ide-build/server/centos7/x86_64

Expand Down
2 changes: 1 addition & 1 deletion r-session-complete/Dockerfile.ubuntu2204
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,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.09.1+494.pro2
ARG RSW_VERSION=2023.12.0+369.pro3
ARG RSW_NAME=rstudio-workbench
ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64

Expand Down
2 changes: 1 addition & 1 deletion r-session-complete/Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ IMAGE_PREFIX := ""
PRODUCT := "r-session-complete"
IMAGE_OS := "ubuntu2204"

RSW_VERSION := "2023.09.1+494.pro2"
RSW_VERSION := "2023.12.0+369.pro3"
RSW_LICENSE := ""

DRIVERS_VERSION := "2023.05.0"
Expand Down
2 changes: 1 addition & 1 deletion r-session-complete/README.md
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-2023.09.1`, `ubuntu2204-2023.09.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/r-session-complete/Dockerfile.ubuntu2204)
* [`jammy`, `ubuntu2204`, `jammy-2023.12.0`, `ubuntu2204-2023.12.0`](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: 1 addition & 1 deletion tools/get-version.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def clean_product_selection(product: str) -> str:


def rstudio_workbench_daily():
version_json = download_json("https://dailies.rstudio.com/rstudio/ocean-storm/index.json")
version_json = download_json("https://dailies.rstudio.com/rstudio/chocolate-cosmos/index.json")
return version_json['workbench']['platforms']['jammy-amd64']['version']


Expand Down
4 changes: 2 additions & 2 deletions workbench-for-google-cloud-workstations/.env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
RSW_VERSION=2023.03.2+454.pro2
RSW_TAG_VERSION=2023.03.2-454.pro2
RSW_VERSION=2023.12.0+369.pro3
RSW_TAG_VERSION=2023.12.0-369.pro3
RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/bionic/amd64
RSW_NAME=rstudio-workbench
PYTHON_VERSION=3.10.12
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ARG PYTHON_VERSION_JUPYTER=3.10.12
ARG JUPYTERLAB_VERSION=3.6.5
ARG QUARTO_VERSION=1.3.340
ARG DRIVERS_VERSION=2023.05.0
ARG RSW_VERSION=2023.03.2+454.pro2
ARG RSW_VERSION=2023.12.0+369.pro3
ARG RSW_NAME=rstudio-workbench
ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/bionic/amd64

Expand Down
2 changes: 1 addition & 1 deletion workbench-for-microsoft-azure-ml/.env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
RSW_VERSION=2023.09.1+494.pro2
RSW_VERSION=2023.12.0+369.pro3
RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/bionic/amd64
RSW_NAME=rstudio-workbench
PYTHON_VERSION=3.9.14
Expand Down
2 changes: 1 addition & 1 deletion workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,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.5
ARG RSW_VERSION=2023.09.1+494.pro2
ARG RSW_VERSION=2023.12.0+369.pro3
ARG RSW_NAME=rstudio-workbench
ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64
ARG DEBIAN_FRONTEND=noninteractive
Expand Down
2 changes: 1 addition & 1 deletion workbench-for-microsoft-azure-ml/Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ IMAGE_PREFIX := "rstudio-"
PRODUCT := "workbench"
IMAGE_OS := "ubuntu2204"

RSW_VERSION := "2023.09.1+494.pro2"
RSW_VERSION := "2023.12.0+369.pro3"
RSW_LICENSE := ""

R_VERSION := "4.2.3"
Expand Down
2 changes: 1 addition & 1 deletion workbench/.env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
RSW_VERSION=2023.09.1+494.pro2
RSW_VERSION=2023.12.0+369.pro3
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
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,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.5
ARG RSW_VERSION=2023.09.1+494.pro2
ARG RSW_VERSION=2023.12.0+369.pro3
ARG RSW_NAME=rstudio-workbench
ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64

Expand Down
2 changes: 1 addition & 1 deletion workbench/Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ IMAGE_PREFIX := "rstudio-"
PRODUCT := "workbench"
IMAGE_OS := "ubuntu2204"

RSW_VERSION := "2023.09.1+494.pro2"
RSW_VERSION := "2023.12.0+369.pro3"
RSW_RELEASE_TYPE := "release"
RSW_LICENSE := ""
RSW_LICENSE_SERVER := ""
Expand Down
2 changes: 1 addition & 1 deletion workbench/README.md
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-2023.09.1`, `ubuntu2204-2023.09.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/workbench/Dockerfile.ubuntu2204)
* [`jammy`, `ubuntu2204`, `jammy-2023.12.0`, `ubuntu2204-2023.12.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/workbench/Dockerfile.ubuntu2204)

# What is RStudio Workbench?

Expand Down

0 comments on commit 1d65c5b

Please sign in to comment.