Skip to content

Commit aee0a3a

Browse files
melissa-barcamelissa-barca
authored
Merge pull request #882 from rstudio/dev
Pull dev into main
2 parents 94d4b6b + 6256435 commit aee0a3a

File tree

16 files changed

+22
-58
lines changed

16 files changed

+22
-58
lines changed

‎.github/workflows/build-bake.yaml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,6 @@ jobs:
333333
snyk-token: '${{ secrets.SNYK_TOKEN }}'
334334

335335
workbench-session-init:
336-
if: false # TODO: Re-enable this job after next release
337336
needs: [setup]
338337
name: Workbench Session Init
339338
runs-on: ubuntu-latest-8x
@@ -363,28 +362,7 @@ jobs:
363362
with:
364363
buildkitd-config: ./share/buildkitd.toml
365364

366-
- name: Set up Just
367-
uses: extractions/setup-just@v2
368-
env:
369-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
370-
371-
- uses: actions/setup-python@v5
372-
with:
373-
python-version: '3.12'
374-
375-
- name: Install Python dependencies
376-
run: |
377-
pip install requests
378-
379-
- name: Get Version
380-
id: get-version
381-
run: |
382-
WORKBENCH_SESSION_INIT_VERSION=$(just -f ci.Justfile get-version workbench --type=daily --local)
383-
echo "WORKBENCH_SESSION_INIT_VERSION=$WORKBENCH_SESSION_INIT_VERSION" >> $GITHUB_OUTPUT
384-
385365
- name: Build, Test, and Push
386-
env:
387-
WORKBENCH_SESSION_INIT_VERSION: ${{ steps.get-version.outputs.WORKBENCH_SESSION_INIT_VERSION }}
388366
uses: ./.github/actions/bake-test-push
389367
with:
390368
target: ${{ env.target }}

‎Justfile

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ sed_vars := if os() == "macos" { "-i ''" } else { "-i" }
88
BUILDX_PATH := ""
99

1010
RSC_VERSION := "2024.11.0"
11-
RSPM_VERSION := "2024.08.2-9"
12-
RSW_VERSION := "2024.09.1+394.pro7"
11+
RSPM_VERSION := "2024.11.0-7"
12+
RSW_VERSION := "2024.12.0+467.pro1"
1313

1414
DRIVERS_VERSION := "2023.05.0"
1515
DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1"
@@ -49,13 +49,8 @@ delete-builder:
4949
alias build := bake
5050
# just bake workbench-images
5151
bake target="default":
52-
#!/bin/bash
5352
just -f {{justfile()}} create-builder || true
54-
if [ -z "$WORKBENCH_SESSION_INIT_VERSION" ]; then
55-
WORKBENCH_SESSION_INIT_VERSION=$(just -f ci.Justfile get-version workbench --type=daily --local)
56-
fi
5753
GIT_SHA=$(git rev-parse --short HEAD) \
58-
WORKBENCH_SESSION_INIT_VERSION=${WORKBENCH_SESSION_INIT_VERSION} \
5954
docker buildx bake --builder=posit-builder -f docker-bake.hcl {{target}}
6055

6156
# just preview-bake workbench-images dev
@@ -93,12 +88,7 @@ preview-plan branch="$(git branch --show-current)":
9388

9489
# just test workbench
9590
test target="default" file="docker-bake.hcl":
96-
#!/bin/bash
97-
if [ -z "$WORKBENCH_SESSION_INIT_VERSION" ]; then
98-
WORKBENCH_SESSION_INIT_VERSION=$(just -f ci.Justfile get-version workbench --type=daily --local)
99-
fi
10091
GIT_SHA=$(git rev-parse --short HEAD) \
101-
WORKBENCH_SESSION_INIT_VERSION=${WORKBENCH_SESSION_INIT_VERSION} \
10292
python3 {{justfile_directory()}}/tools/test_bake_artifacts.py --target "{{target}}" --file "{{file}}"
10393

10494
# just preview-test connect dev

‎docker-bake.hcl

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,11 @@ variable CONNECT_VERSION {
44
}
55

66
variable PACKAGE_MANAGER_VERSION {
7-
default = "2024.08.2-9"
7+
default = "2024.11.0-7"
88
}
99

1010
variable WORKBENCH_VERSION {
11-
default = "2024.09.1+394.pro7"
12-
}
13-
14-
variable WORKBENCH_SESSION_INIT_VERSION {
15-
default = ""
11+
default = "2024.12.0+467.pro1"
1612
}
1713

1814
variable DRIVERS_VERSION {
@@ -500,16 +496,16 @@ target "workbench-session-init" {
500496
inherits = ["base"]
501497
target = "build"
502498

503-
name = "workbench-session-init-${builds.os}-${replace(tag_safe_version(WORKBENCH_SESSION_INIT_VERSION), ".", "-")}"
504-
tags = get_tags(builds.os, "workbench-session-init", WORKBENCH_SESSION_INIT_VERSION)
499+
name = "workbench-session-init-${builds.os}-${replace(tag_safe_version(WORKBENCH_VERSION), ".", "-")}"
500+
tags = get_tags(builds.os, "workbench-session-init", WORKBENCH_VERSION)
505501

506502
dockerfile = "Dockerfile.${builds.os}"
507503
context = "workbench-session-init"
508504

509505
matrix = WORKBENCH_SESSION_INIT_BUILD_MATRIX
510506

511507
args = {
512-
RSW_VERSION = WORKBENCH_SESSION_INIT_VERSION
508+
RSW_VERSION = WORKBENCH_VERSION
513509
}
514510
}
515511

‎package-manager/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
RSPM_VERSION=2024.08.2-9
1+
RSPM_VERSION=2024.11.0-7
22
R_VERSION=4.4.0
33
R_VERSION_ALT=4.1.3
44
PYTHON_VERSION=3.9.17

‎package-manager/Dockerfile.ubuntu2204

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN apt-get update -qq && apt-get install -y --no-install-recommends \
1818
apt-get clean && rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
1919

2020
# Download RStudio Package Manager ---------------------------------------------#
21-
ARG RSPM_VERSION=2024.08.2-9
21+
ARG RSPM_VERSION=2024.11.0-7
2222
ARG RSPM_DOWNLOAD_URL=https://cdn.rstudio.com/package-manager/deb/amd64
2323
RUN curl -fsSL -O ${RSPM_DOWNLOAD_URL}/rstudio-pm_${RSPM_VERSION}_amd64.deb \
2424
# Pre 7/25/23 packages

‎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.09.1+394.pro7
3+
RSW_VERSION=2024.12.0+467.pro1
44
DRIVERS_VERSION=2024.03.0-1

‎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.09.1+394.pro7
9+
ARG RSW_VERSION=2024.12.0+467.pro1
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.09.1`, `ubuntu2204-2024.09.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/r-session-complete/Dockerfile.ubuntu2204)
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)
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.09.1+394.pro7
2-
RSW_TAG_VERSION=2024.09.1-394.pro7
1+
RSW_VERSION=2024.12.0+467.pro1
2+
RSW_TAG_VERSION=2024.12.0-467.pro1
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/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.09.1+394.pro7
13+
ARG RSW_VERSION=2024.12.0+467.pro1
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.09.1+394.pro7
1+
RSW_VERSION=2024.12.0+467.pro1
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.09.1+394.pro7
10+
ARG RSW_VERSION=2024.12.0+467.pro1
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.09.1+394.pro7' \
181+
org.opencontainers.image.version='2024.12.0+467.pro1' \
182182
org.opencontainers.image.url='https://www.rstudio.com/products/workbench/'

‎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.09.1+394.pro7
11+
ARG RSW_VERSION=2024.12.0+467.pro1
1212
ARG GO_VERSION=1.22.2
1313

1414
# Download the RStudio Workbench session components and install Go

‎workbench/.env

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

‎workbench/Dockerfile.ubuntu2204

Lines changed: 1 addition & 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.09.1+394.pro7
10+
ARG RSW_VERSION=2024.12.0+467.pro1
1111
ARG RSW_NAME=rstudio-workbench
1212
ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64
1313
ARG SCRIPTS_DIR=/opt/positscripts

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

1212
# What is RStudio Workbench?
1313

0 commit comments

Comments
 (0)