Skip to content

Commit d57a505

Browse files
bschwedlerbschwedler
authored
Merge pull request #742 from rstudio/dev
Release Workbench `2024.04.0` & Connect `2024.04.0`
2 parents c20b809 + 75f550b commit d57a505

File tree

24 files changed

+44
-106
lines changed

24 files changed

+44
-106
lines changed

‎.github/workflows/build-bake-preview.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
on:
22
schedule:
3-
- cron: '0 8 * * *'
4-
- cron: '0 9 * * *'
3+
- cron: '0 * * * *'
54
push:
65
branches:
76
- main

‎.github/workflows/lint.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ jobs:
2424
- {product: 'connect', os: 'ubuntu2204'}
2525
- {product: 'connect-content-init', os: 'ubuntu2204'}
2626
- {product: 'package-manager', os: 'ubuntu2204'}
27-
- {product: 'r-session-complete', os: 'centos7'}
2827
- {product: 'r-session-complete', os: 'ubuntu2204'}
2928
- {product: 'workbench-for-microsoft-azure-ml', os: 'ubuntu2204'}
3029
- {product: 'content/base', os: 'ubuntu1804'}

‎Justfile

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ sed_vars := if os() == "macos" { "-i ''" } else { "-i" }
77

88
BUILDX_PATH := ""
99

10-
RSC_VERSION := "2024.03.0"
10+
RSC_VERSION := "2024.04.0"
1111
RSPM_VERSION := "2023.12.0-13"
12-
RSW_VERSION := "2023.12.1+402.pro1"
12+
RSW_VERSION := "2024.04.0+735.pro3"
1313

1414
DRIVERS_VERSION := "2023.05.0"
1515
DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1"
@@ -22,7 +22,7 @@ PYTHON_VERSION_ALT := "3.8.17"
2222
PYTHON_VERSION_RHEL := "3.9.14"
2323
PYTHON_VERSION_ALT_RHEL := "3.8.15"
2424

25-
QUARTO_VERSION := "1.3.450"
25+
QUARTO_VERSION := "1.4.553"
2626

2727
export RSC_LICENSE := ""
2828
export RSPM_LICENSE := ""
@@ -266,11 +266,7 @@ update-rsc-versions:
266266
connect/.env \
267267
connect/Dockerfile.ubuntu2204 \
268268
connect-content-init/Dockerfile.ubuntu2204
269-
sed {{ sed_vars }} "s/RSC_VERSION:.*/RSC_VERSION: {{ RSC_VERSION }}/g" docker-compose.yml
270-
sed {{ sed_vars }} "s/rstudio\/rstudio-connect:.*/rstudio\/rstudio-connect:{{ RSC_VERSION }}/g" docker-compose.yml
271269
sed {{ sed_vars }} "s/^RSC_VERSION := .*/RSC_VERSION := \"{{ RSC_VERSION }}\"/g" \
272-
connect/Justfile \
273-
connect-content-init/Justfile \
274270
Justfile
275271
sed {{ sed_vars }} -E "s/[0-9]{4}\.[0-9]{1,2}\.[0-9]{1,2}/`just _get-clean-version {{ RSC_VERSION }}`/g" \
276272
connect/README.md \

‎connect-content-init/Dockerfile.ubuntu2204

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN apt-get update && \
99
apt-get install -y --no-install-recommends ca-certificates curl && \
1010
rm -rf /var/lib/apt/lists/*
1111

12-
ARG RSC_VERSION=2024.03.0
12+
ARG RSC_VERSION=2024.04.0
1313
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
1414
RUN mkdir -p /rsc-staging && \
1515
RSC_VERSION_URL=$(echo -n "${RSC_VERSION}" | sed 's/+/%2B/g') && \

‎connect-content-init/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
# Supported tags and respective Dockerfile links
1111

12-
* [`jammy`, `ubuntu2204`, `jammy-2024.03.0`, `ubuntu2204-2024.03.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)
12+
* [`jammy`, `ubuntu2204`, `jammy-2024.04.0`, `ubuntu2204-2024.04.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)
1313

1414
# RStudio Connect Content Init Container
1515

@@ -31,7 +31,7 @@ The version of the release package to use can be overridden with the
3131
`RSC_VERSION` build arg.
3232

3333
```console
34-
just build ubuntu2204 2024.03.0
34+
just build ubuntu2204 2024.04.0
3535
```
3636

3737
## Testing
@@ -56,7 +56,7 @@ just test
5656
You can see the different layers that make up the image:
5757

5858
```console
59-
docker history rstudio/rstudio-connect-content-init-preview:2024.03.0-dev-326
59+
docker history rstudio/rstudio-connect-content-init-preview:2024.04.0-dev-326
6060
```
6161

6262
NOTE: almost all the image size is pandoc.

‎connect/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
RSC_VERSION=2024.03.0
1+
RSC_VERSION=2024.04.0
22
R_VERSION=4.2.3
33
R_VERSION_ALT=4.1.3
44
PYTHON_VERSION=3.9.17

‎connect/Dockerfile.ubuntu2204

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ ARG R_VERSION=4.2.3
77
ARG R_VERSION_ALT=4.1.3
88
ARG PYTHON_VERSION=3.9.17
99
ARG PYTHON_VERSION_ALT=3.8.17
10-
ARG RSC_VERSION=2024.03.0
11-
ARG QUARTO_VERSION=1.3.340
10+
ARG RSC_VERSION=2024.04.0
11+
ARG QUARTO_VERSION=1.4.552
1212
ARG SCRIPTS_DIR=/opt/positscripts
1313

1414
### Install Quarto ###

‎connect/NEWS.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 2024-04-30
2+
3+
- BREAKING: Upgrade the default Quarto version to 1.4.552.
4+
15
# 2023-08-01
26
- BREAKING: Removed R 3.6.2, replaced with R 4.1.3.
37
- Updated R 4.2.0 to 4.2.3.

‎connect/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
# Supported tags and respective Dockerfile links
99

10-
* [`jammy`, `ubuntu2204`, `jammy-2024.03.0`, `ubuntu2204-2024.03.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)
10+
* [`jammy`, `ubuntu2204`, `jammy-2024.04.0`, `ubuntu2204-2024.04.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)
1111

1212
# What is Posit Connect?
1313

‎docker-bake.hcl

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
### Variable definitions ###
22
variable CONNECT_VERSION {
3-
default = "2024.03.0"
3+
default = "2024.04.0"
44
}
55

66
variable PACKAGE_MANAGER_VERSION {
77
default = "2023.12.0-13"
88
}
99

1010
variable WORKBENCH_VERSION {
11-
default = "2023.12.1+402.pro1"
11+
default = "2024.04.0+735.pro3"
1212
}
1313

1414
variable DRIVERS_VERSION {
@@ -101,7 +101,7 @@ variable PACKAGE_MANAGER_BUILD_MATRIX {
101101
variable CONNECT_BUILD_MATRIX {
102102
default = {
103103
builds = [
104-
{os = "ubuntu2204", r_primary = "4.2.3", r_alternate = "4.1.3", py_primary = "3.9.17", py_alternate = "3.8.17", quarto = "1.3.340"},
104+
{os = "ubuntu2204", r_primary = "4.2.3", r_alternate = "4.1.3", py_primary = "3.9.17", py_alternate = "3.8.17", quarto = DEFAULT_QUARTO_VERSION},
105105
]
106106
}
107107
}
@@ -148,7 +148,6 @@ variable CONTENT_BUILD_MATRIX {
148148
variable R_SESSION_COMPLETE_BUILD_MATRIX {
149149
default = {
150150
builds = [
151-
{os = "centos7", r_primary = "4.2.3", r_alternate = "4.1.3", py_primary = "3.9.14", py_alternate = "3.8.15"},
152151
{os = "ubuntu2204", r_primary = "4.2.3", r_alternate = "4.1.3", py_primary = "3.9.14", py_alternate = "3.8.15"},
153152
]
154153
}
@@ -224,9 +223,9 @@ target "product-base" {
224223
"ghcr.io/rstudio/product-base:${builds.os}-r${builds.r_primary}_${builds.r_alternate}-py${builds.py_primary}_${builds.py_alternate}",
225224
"docker.io/rstudio/product-base:${builds.os}-r${builds.r_primary}_${builds.r_alternate}-py${builds.py_primary}_${builds.py_alternate}",
226225
]
227-
226+
228227
dockerfile = "Dockerfile.${builds.os}"
229-
context = "product/base"
228+
context = "product/base"
230229

231230
matrix = BASE_BUILD_MATRIX
232231
args = {
@@ -235,7 +234,7 @@ target "product-base" {
235234
PYTHON_VERSION = builds.py_primary
236235
PYTHON_VERSION_ALT = builds.py_alternate
237236
TINI_VERSION = "0.19.0"
238-
}
237+
}
239238
}
240239

241240
target "product-base-pro" {
@@ -248,7 +247,7 @@ target "product-base-pro" {
248247
"docker.io/rstudio/product-base-pro:${builds.os}-r${builds.r_primary}_${builds.r_alternate}-py${builds.py_primary}_${builds.py_alternate}",
249248
]
250249

251-
dockerfile = "Dockerfile.${builds.os}"
250+
dockerfile = "Dockerfile.${builds.os}"
252251
context = "product/pro"
253252
contexts = {
254253
product-base = "target:product-base-${builds.os}-r${replace(builds.r_primary, ".", "-")}_${replace(builds.r_alternate, ".", "-")}-py${replace(builds.py_primary, ".", "-")}_${replace(builds.py_alternate, ".", "-")}"
@@ -400,8 +399,8 @@ target "r-session-complete" {
400399
PYTHON_VERSION_ALT = builds.py_alternate
401400
JUPYTERLAB_VERSION = DEFAULT_JUPYTERLAB_VERSION
402401
RSW_VERSION = WORKBENCH_VERSION
403-
RSW_NAME = builds.os == "centos7" ? "rstudio-workbench-rhel" : "rstudio-workbench"
404-
RSW_DOWNLOAD_URL = builds.os == "centos7" ? "https://s3.amazonaws.com/rstudio-ide-build/server/centos7/x86_64" : "https://download2.rstudio.org/server/jammy/amd64"
402+
RSW_NAME = "rstudio-workbench"
403+
RSW_DOWNLOAD_URL = "https://download2.rstudio.org/server/jammy/amd64"
405404
}
406405
}
407406

@@ -427,7 +426,7 @@ target "workbench" {
427426
RSW_VERSION = WORKBENCH_VERSION
428427
RSW_NAME = "rstudio-workbench"
429428
RSW_DOWNLOAD_URL = "https://download2.rstudio.org/server/jammy/amd64"
430-
}
429+
}
431430
}
432431

433432
### Workbench for Google Cloud Workstations targets ###
@@ -462,7 +461,7 @@ target "workbench-for-google-cloud-workstations" {
462461
RSW_VERSION = WORKBENCH_VERSION
463462
RSW_NAME = "rstudio-workbench"
464463
RSW_DOWNLOAD_URL = "https://download2.rstudio.org/server/focal/amd64"
465-
}
464+
}
466465
}
467466

468467
### Workbench for Microsoft Azure ML targets ###
@@ -489,7 +488,7 @@ target "build-workbench-for-microsoft-azure-ml" {
489488
RSW_VERSION = WORKBENCH_VERSION
490489
RSW_NAME = "rstudio-workbench"
491490
RSW_DOWNLOAD_URL = "https://download2.rstudio.org/server/jammy/amd64"
492-
}
491+
}
493492
}
494493

495494
target "scan-workbench-for-microsoft-azure-ml" {

‎docker-bake.preview.hcl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ variable PACKAGE_MANAGER_BUILD_MATRIX {
130130
variable CONNECT_BUILD_MATRIX {
131131
default = {
132132
builds = [
133-
{os = "ubuntu2204", r_primary = "4.2.3", r_alternate = "4.1.3", py_primary = "3.11.9", py_alternate = "3.10.14", quarto = "1.3.340"},
133+
{os = "ubuntu2204", r_primary = "4.2.3", r_alternate = "4.1.3", py_primary = "3.11.9", py_alternate = "3.10.14", quarto = DEFAULT_QUARTO_VERSION},
134134
]
135135
}
136136
}
@@ -146,7 +146,6 @@ variable CONNECT_CONTENT_INIT_BUILD_MATRIX {
146146
variable R_SESSION_COMPLETE_BUILD_MATRIX {
147147
default = {
148148
builds = [
149-
{os = "centos7", r_primary = "4.2.3", r_alternate = "4.1.3", py_primary = "3.11.9", py_alternate = "3.10.14"},
150149
{os = "ubuntu2204", r_primary = "4.2.3", r_alternate = "4.1.3", py_primary = "3.11.9", py_alternate = "3.10.14"},
151150
]
152151
}
@@ -367,7 +366,7 @@ target "r-session-complete-daily" {
367366
PYTHON_VERSION_ALT = builds.py_alternate
368367
JUPYTERLAB_VERSION = DEFAULT_JUPYTERLAB_VERSION
369368
RSW_VERSION = WORKBENCH_DAILY_VERSION
370-
RSW_NAME = builds.os == "centos7" ? "rstudio-workbench-rhel" : "rstudio-workbench"
369+
RSW_NAME = "rstudio-workbench"
371370
RSW_DOWNLOAD_URL = get_rsw_download_url(builds.os)
372371
}
373372
}
@@ -393,7 +392,7 @@ target "r-session-complete-preview" {
393392
PYTHON_VERSION_ALT = builds.py_alternate
394393
JUPYTERLAB_VERSION = DEFAULT_JUPYTERLAB_VERSION
395394
RSW_VERSION = WORKBENCH_PREVIEW_VERSION
396-
RSW_NAME = builds.os == "centos7" ? "rstudio-workbench-rhel" : "rstudio-workbench"
395+
RSW_NAME = "rstudio-workbench"
397396
RSW_DOWNLOAD_URL = get_rsw_download_url(builds.os)
398397
}
399398
}

‎r-session-complete/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
R_VERSION=4.1.0
22
PYTHON_VERSION=3.9.5
3-
RSW_VERSION=2023.12.1+402.pro1
3+
RSW_VERSION=2024.04.0+735.pro3
44
DRIVERS_VERSION=2024.03.0-1

‎r-session-complete/Dockerfile.centos7

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎r-session-complete/Dockerfile.ubuntu2204

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ARG R_VERSION_ALT=4.1.3
66
ARG PYTHON_VERSION=3.9.17
77
ARG PYTHON_VERSION_ALT=3.8.17
88
ARG JUPYTERLAB_VERSION=3.6.5
9-
ARG RSW_VERSION=2023.12.1+402.pro1
9+
ARG RSW_VERSION=2024.04.0+735.pro3
1010
ARG RSW_NAME=rstudio-workbench
1111
ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64
1212
ARG SCRIPTS_DIR=/opt/positscripts

‎r-session-complete/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
# Supported tags and respective Dockerfile links
99

10-
* [`jammy`, `ubuntu2204`, `jammy-2023.12.1`, `ubuntu2204-2023.12.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/r-session-complete/Dockerfile.ubuntu2204)
10+
* [`jammy`, `ubuntu2204`, `jammy-2024.04.0`, `ubuntu2204-2024.04.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/r-session-complete/Dockerfile.ubuntu2204)
1111

1212
# What are the r-session-complete images?
1313

‎r-session-complete/test/run_tests.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ GOSS_MAX_CONCURRENT=${GOSS_MAX_CONCURRENT:-50}
66

77
if [ -f /etc/debian_version ]; then
88
OS="ubuntu"
9-
elif [ -f /etc/centos-release ]; then
10-
OS="centos"
119
else
1210
echo "OS not supported. Exiting"
1311
exit 1

‎tools/get-version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def clean_product_selection(product: str) -> str:
9797

9898

9999
def rstudio_workbench_daily():
100-
version_json = download_json("https://dailies.rstudio.com/rstudio/chocolate-cosmos/index.json")
100+
version_json = download_json("https://dailies.rstudio.com/rstudio/cranberry-hibiscus/index.json")
101101
return version_json['workbench']['platforms']['jammy-amd64']['version']
102102

103103

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
RSW_VERSION=2023.12.1+402.pro1
2-
RSW_TAG_VERSION=2023.12.1-402.pro1
1+
RSW_VERSION=2024.04.0+735.pro3
2+
RSW_TAG_VERSION=2024.04.0-735.pro3
33
RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/focal/amd64
44
RSW_NAME=rstudio-workbench
55
PYTHON_VERSION=3.10.13

‎workbench-for-google-cloud-workstations/Dockerfile.ubuntu2004

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ARG PYTHON_VERSION_ALT=3.10.13
99
ARG PYTHON_VERSION_JUPYTER=3.10.13
1010
ARG JUPYTERLAB_VERSION=3.6.7
1111
ARG DRIVERS_VERSION=2023.05.0
12-
ARG RSW_VERSION=2023.12.1+402.pro1
12+
ARG RSW_VERSION=2024.04.0+735.pro3
1313
ARG RSW_NAME=rstudio-workbench
1414
ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/focal/amd64
1515
ARG SCRIPTS_DIR=/opt/positscripts

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
RSW_VERSION=2023.12.1+402.pro1
1+
RSW_VERSION=2024.04.0+735.pro3
22
RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/bionic/amd64
33
RSW_NAME=rstudio-workbench
44
PYTHON_VERSION=3.9.14

‎workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ARG PYTHON_VERSION=3.9.17
77
ARG PYTHON_VERSION_ALT=3.8.17
88
ARG PYTHON_VERSION_JUPYTER=3.8.17
99
ARG JUPYTERLAB_VERSION=3.6.7
10-
ARG RSW_VERSION=2023.12.1+402.pro1
10+
ARG RSW_VERSION=2024.04.0+735.pro3
1111
ARG RSW_NAME=rstudio-workbench
1212
ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64
1313
ARG SCRIPTS_DIR=/opt/positscripts
@@ -178,5 +178,5 @@ LABEL \
178178
azure.ii.endpoints='[{"label":"connect","target":8787,"protocol":"http"}]' \
179179
org.opencontainers.image.description='A professional integrated development environment for data science teams using R and Python' \
180180
org.opencontainers.image.title='RStudio Workbench' \
181-
org.opencontainers.image.version='2023.06.2+561.pro5' \
181+
org.opencontainers.image.version='2024.04.0+735.pro3' \
182182
org.opencontainers.image.url='https://www.rstudio.com/products/workbench/'

0 commit comments

Comments
 (0)