Skip to content

Commit 9fb6666

Browse files
bschwedlerbschwedler
authored
Merge pull request #897 from rstudio/dev
Release Workbench 2024.12.1
2 parents 1e83081 + 0e12b37 commit 9fb6666

File tree

21 files changed

+94
-66
lines changed

21 files changed

+94
-66
lines changed

‎Justfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ BUILDX_PATH := ""
99

1010
RSC_VERSION := "2025.01.0"
1111
RSPM_VERSION := "2024.11.0-7"
12-
RSW_VERSION := "2024.12.0+467.pro1"
12+
RSW_VERSION := "2024.12.1+563.pro5"
1313

1414
DRIVERS_VERSION := "2023.05.0"
1515
DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1"

‎connect/.snyk

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,4 @@
22
version: v1.25.0
33
# ignores vulnerabilities until expiry date; change duration by modifying expiry date
44
ignore:
5-
SNYK-GOLANG-GITHUBCOMJACKCPGXV4-7416900:
6-
- '*':
7-
reason: 'Reported upstream in https://github.com/rstudio/connect/issues/27482'
8-
expires: 2024-07-31T00:00:00.000Z
9-
created: 2024-07-03T13:49:12.040Z
105
patch: {}

‎docker-bake.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ variable PACKAGE_MANAGER_VERSION {
88
}
99

1010
variable WORKBENCH_VERSION {
11-
default = "2024.12.0+467.pro1"
11+
default = "2024.12.1+563.pro5"
1212
}
1313

1414
variable DRIVERS_VERSION {

‎package-manager/.snyk

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,19 @@
22
version: v1.25.0
33
# ignores vulnerabilities until expiry date; change duration by modifying expiry date
44
ignore:
5-
SNYK-GOLANG-GITHUBCOMJACKCPGXV4-7416900:
5+
SNYK-GOLANG-GOLANGORGXNETHTML-8535262:
66
- '*':
7-
reason: >-
8-
Reported upstream in
9-
https://github.com/rstudio/package-manager/issues/13981
10-
expires: 2024-10-01T00:00:00.000Z
11-
created: 2024-07-03T14:03:16.019Z
7+
reason: Patch will be ingested in next release
8+
expires: 2025-03-31T00:00:00.000Z
9+
created: 2025-01-24T01:05:55.359Z
10+
SNYK-GOLANG-GITHUBCOMGOGITGOGITV5PLUMBING-8602520:
11+
- '*':
12+
reason: Patch will be ingested in next release
13+
expires: 2025-03-31T00:00:00.000Z
14+
created: 2025-01-24T01:08:04.773Z
15+
SNYK-GOLANG-GOLANGORGXCRYPTOSSH-8496611:
16+
- '*':
17+
reason: Patch will be ingested in next release
18+
expires: 2025-03-31T00:00:00.000Z
19+
created: 2025-01-24T01:08:19.247Z
1220
patch: {}

‎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=2024.12.0+467.pro1
3+
RSW_VERSION=2024.12.1+563.pro5
44
DRIVERS_VERSION=2024.03.0-1

‎r-session-complete/.snyk

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,18 @@
22
version: v1.25.0
33
# ignores vulnerabilities until expiry date; change duration by modifying expiry date
44
ignore:
5-
SNYK-GOLANG-GITHUBCOMCREWJAMSAML-5971016:
5+
SNYK-JS-SEMVER-3247795:
66
- '*':
77
reason: >-
8-
Reported upstream in
9-
https://github.com/rstudio/rstudio-pro/issues/6529
10-
expires: 2024-08-31T00:00:00.000Z
11-
created: 2024-07-02T20:33:30.847Z
12-
SNYK-GOLANG-GITHUBCOMGOJOSEGOJOSEV3-6070737:
8+
Awaiting upstream patch in jupyterlab, but exploit should not be
9+
reachable.
10+
expires: 2025-03-31T00:00:00.000Z
11+
created: 2025-01-24T01:42:36.788Z
12+
SNYK-JS-WS-7266574:
1313
- '*':
1414
reason: >-
15-
Confirmed fixed upstream in
16-
https://github.com/rstudio/rstudio-pro/issues/6635. Patch will be
17-
ingested in Workbench 2024.08.0 (expected within 1 week).
18-
expires: 2024-08-07T00:00:00.000Z
19-
created: 2024-07-31T17:46:24.852Z
15+
Awaiting upstream patch in jupyterlab, but Jupyterlab is not using the
16+
package component affected.
17+
expires: 2025-03-31T00:00:00.000Z
18+
created: 2025-01-24T01:58:55.561Z
2019
patch: {}

‎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.3.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=2024.12.0+467.pro1
9+
ARG RSW_VERSION=2024.12.1+563.pro5
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-2024.12.0`, `ubuntu2204-2024.12.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/r-session-complete/Dockerfile.ubuntu2204)
10+
* [`jammy`, `ubuntu2204`, `jammy-2024.12.1`, `ubuntu2204-2024.12.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/r-session-complete/Dockerfile.ubuntu2204)
1111

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

‎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=2024.12.0+467.pro1
2-
RSW_TAG_VERSION=2024.12.0-467.pro1
1+
RSW_VERSION=2024.12.1+563.pro5
2+
RSW_TAG_VERSION=2024.12.1-563.pro5
33
RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64
44
RSW_NAME=rstudio-workbench
55
PYTHON_VERSION=3.11.9

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

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,18 @@
22
version: v1.25.0
33
# ignores vulnerabilities until expiry date; change duration by modifying expiry date
44
ignore:
5-
SNYK-GOLANG-GITHUBCOMCREWJAMSAML-5971016:
5+
SNYK-JS-SEMVER-3247795:
66
- '*':
77
reason: >-
8-
Reported upstream in
9-
https://github.com/rstudio/rstudio-pro/issues/6529
10-
expires: 2024-08-31T00:00:00.000Z
11-
created: 2024-07-02T20:33:30.847Z
12-
SNYK-GOLANG-GITHUBCOMGOJOSEGOJOSEV3-6070737:
8+
Awaiting upstream patch in jupyterlab, but exploit should not be
9+
reachable.
10+
expires: 2025-03-31T00:00:00.000Z
11+
created: 2025-01-24T01:42:36.788Z
12+
SNYK-JS-WS-7266574:
1313
- '*':
1414
reason: >-
15-
Confirmed fixed upstream in
16-
https://github.com/rstudio/rstudio-pro/issues/6635. Patch will be
17-
ingested in Workbench 2024.08.0 (expected within 1 week).
18-
expires: 2024-08-07T00:00:00.000Z
19-
created: 2024-07-31T17:46:24.852Z
20-
SNYK-GOLANG-GOLANGORGXNETHTTP2-6531285:
21-
- '*':
22-
reason: Vulnerability in Google Cloud SDK.
23-
expires: 2024-09-01T00:00:00.000Z
24-
created: 2024-07-31T19:45:25.728Z
15+
Awaiting upstream patch in jupyterlab, but Jupyterlab is not using the
16+
package component affected.
17+
expires: 2025-03-31T00:00:00.000Z
18+
created: 2025-01-24T01:58:55.561Z
2519
patch: {}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ARG PYTHON_VERSION_ALT=3.10.14
1010
ARG PYTHON_VERSION_JUPYTER=3.10.14
1111
ARG JUPYTERLAB_VERSION=3.6.7
1212
ARG DRIVERS_VERSION=2023.05.0
13-
ARG RSW_VERSION=2024.12.0+467.pro1
13+
ARG RSW_VERSION=2024.12.1+563.pro5
1414
ARG RSW_NAME=rstudio-workbench
1515
ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64
1616
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=2024.12.0+467.pro1
1+
RSW_VERSION=2024.12.1+563.pro5
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=2024.12.0+467.pro1
10+
ARG RSW_VERSION=2024.12.1+563.pro5
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='2024.12.0+467.pro1' \
181+
org.opencontainers.image.version='2024.12.1+563.pro5' \
182182
org.opencontainers.image.url='https://www.rstudio.com/products/workbench/'

‎workbench-session-init/.snyk

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
2+
version: v1.25.0
3+
# ignores vulnerabilities until expiry date; change duration by modifying expiry date
4+
ignore:
5+
SNYK-JS-BODYPARSER-7926860:
6+
- '*':
7+
reason: >-
8+
Patched upstream in Positron by upgrading express to 4.19.2. Will be
9+
ingested next Workbench release.
10+
expires: 2025-03-31T00:00:00.000Z
11+
created: 2025-01-24T02:04:47.267Z
12+
patch: {}

‎workbench-session-init/Dockerfile.ubuntu2204

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

11-
ARG RSW_VERSION=2024.12.0+467.pro1
11+
ARG RSW_VERSION=2024.12.1+563.pro5
1212
ARG GO_VERSION=1.22.2
1313

1414
# Download the RStudio Workbench session components and install Go

‎workbench-session-init/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ This directory contains a Dockerfile and script that will create an init contain
1212

1313
## Supported tags and respective Dockerfile links
1414

15-
* [`jammy-daily`, `ubuntu2204-daily`, `jammy-2024.11.0`, `ubuntu2204-2024.11.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/workbench-session-init/Dockerfile.2204)
15+
* [`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)
1616

1717
## Building
1818

@@ -34,7 +34,7 @@ You can observe what gets copied by the container:
3434

3535
```console
3636
mkdir init
37-
docker run --rm -v $(pwd)/init:/mnt/init rstudio/workbench-session-init:jammy-2024.11.0
37+
docker run --rm -v $(pwd)/init:/mnt/init rstudio/workbench-session-init:jammy-2024.12.1
3838
# The init directory has been populated with the Workbench session runtime components.
3939
```
4040

‎workbench-session/.snyk

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
2+
version: v1.25.0
3+
# ignores vulnerabilities until expiry date; change duration by modifying expiry date
4+
ignore:
5+
SNYK-JS-SEMVER-3247795:
6+
- '*':
7+
reason: >-
8+
Awaiting upstream patch in jupyterlab, but exploit should not be
9+
reachable.
10+
expires: 2025-03-31T00:00:00.000Z
11+
created: 2025-01-24T01:42:36.788Z
12+
SNYK-JS-WS-7266574:
13+
- '*':
14+
reason: >-
15+
Awaiting upstream patch in jupyterlab, but Jupyterlab is not using the
16+
package component affected.
17+
expires: 2025-03-31T00:00:00.000Z
18+
created: 2025-01-24T01:58:55.561Z
19+
patch: {}

‎workbench/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
RSW_VERSION=2024.12.0+467.pro1
1+
RSW_VERSION=2024.12.1+563.pro5
22
RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/bionic/amd64
33
RSW_NAME=rstudio-workbench
44
PYTHON_VERSION=3.9.17

‎workbench/.snyk

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,18 @@
22
version: v1.25.0
33
# ignores vulnerabilities until expiry date; change duration by modifying expiry date
44
ignore:
5-
SNYK-GOLANG-GITHUBCOMCREWJAMSAML-5971016:
5+
SNYK-JS-SEMVER-3247795:
66
- '*':
77
reason: >-
8-
Reported upstream in
9-
https://github.com/rstudio/rstudio-pro/issues/6529
10-
expires: 2024-08-31T00:00:00.000Z
11-
created: 2024-07-02T20:33:30.847Z
12-
SNYK-GOLANG-GITHUBCOMGOJOSEGOJOSEV3-6070737:
8+
Awaiting upstream patch in jupyterlab, but exploit should not be
9+
reachable.
10+
expires: 2025-03-31T00:00:00.000Z
11+
created: 2025-01-24T01:42:36.788Z
12+
SNYK-JS-WS-7266574:
1313
- '*':
1414
reason: >-
15-
Confirmed fixed upstream in
16-
https://github.com/rstudio/rstudio-pro/issues/6635. Patch will be
17-
ingested in Workbench 2024.08.0 (expected within 1 week).
18-
expires: 2024-08-07T00:00:00.000Z
19-
created: 2024-07-31T17:46:24.852Z
15+
Awaiting upstream patch in jupyterlab, but Jupyterlab is not using the
16+
package component affected.
17+
expires: 2025-03-31T00:00:00.000Z
18+
created: 2025-01-24T01:58:55.561Z
2019
patch: {}

‎workbench/Dockerfile.ubuntu2204

Lines changed: 3 additions & 1 deletion
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=2024.12.0+467.pro1
10+
ARG RSW_VERSION=2024.12.1+563.pro5
1111
ARG RSW_NAME=rstudio-workbench
1212
ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64
1313
ARG SCRIPTS_DIR=/opt/positscripts
@@ -29,6 +29,7 @@ ENV WORKBENCH_JUPYTER_PATH=/usr/local/bin/jupyter
2929
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
3030
RUN apt-get update \
3131
&& apt-get install --no-install-recommends -y \
32+
gdb \
3233
krb5-user \
3334
libcap2 \
3435
libcurl4-gnutls-dev \
@@ -45,6 +46,7 @@ RUN apt-get update \
4546
oddjob-mkhomedir \
4647
rrdtool \
4748
sssd \
49+
strace \
4850
supervisor \
4951
&& RSW_VERSION_URL=$(echo -n "${RSW_VERSION}" | sed 's/+/-/g') \
5052
&& curl -fsSL -o rstudio-workbench.deb "${RSW_DOWNLOAD_URL}/${RSW_NAME}-${RSW_VERSION_URL}-amd64.deb" \

‎workbench/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.12.0`, `ubuntu2204-2024.12.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/workbench/Dockerfile.ubuntu2204)
10+
* [`jammy`, `ubuntu2204`, `jammy-2024.12.1`, `ubuntu2204-2024.12.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/workbench/Dockerfile.ubuntu2204)
1111

1212
# What is RStudio Workbench?
1313

0 commit comments

Comments
 (0)