Merge pull request #882 from rstudio/dev

Pull dev into main
rstudio · Dec 18, 2024 · aee0a3a · aee0a3a
2 parents 94d4b6b + 6256435
commit aee0a3a
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 58 deletions.
diff --git a/.github/workflows/build-bake.yaml b/.github/workflows/build-bake.yaml
@@ -333,7 +333,6 @@ jobs:
           snyk-token: '${{ secrets.SNYK_TOKEN }}'
 
   workbench-session-init:
-    if: false  # TODO: Re-enable this job after next release
     needs: [setup]
     name: Workbench Session Init
     runs-on: ubuntu-latest-8x
@@ -363,28 +362,7 @@ jobs:
         with:
           buildkitd-config: ./share/buildkitd.toml
 
-      - name: Set up Just
-        uses: extractions/setup-just@v2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.12'
-
-      - name: Install Python dependencies
-        run: |
-          pip install requests
-
-      - name: Get Version
-        id: get-version
-        run: |
-          WORKBENCH_SESSION_INIT_VERSION=$(just -f ci.Justfile get-version workbench --type=daily --local)
-          echo "WORKBENCH_SESSION_INIT_VERSION=$WORKBENCH_SESSION_INIT_VERSION" >> $GITHUB_OUTPUT
-
       - name: Build, Test, and Push
-        env:
-          WORKBENCH_SESSION_INIT_VERSION: ${{ steps.get-version.outputs.WORKBENCH_SESSION_INIT_VERSION }}
         uses: ./.github/actions/bake-test-push
         with:
           target: ${{ env.target }}

diff --git a/Justfile b/Justfile
@@ -8,8 +8,8 @@ sed_vars := if os() == "macos" { "-i ''" } else { "-i" }
 BUILDX_PATH := ""
 
 RSC_VERSION := "2024.11.0"
-RSPM_VERSION := "2024.08.2-9"
-RSW_VERSION := "2024.09.1+394.pro7"
+RSPM_VERSION := "2024.11.0-7"
+RSW_VERSION := "2024.12.0+467.pro1"
 
 DRIVERS_VERSION := "2023.05.0"
 DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1"
@@ -49,13 +49,8 @@ delete-builder:
 alias build := bake
 # just bake workbench-images
 bake target="default":
-  #!/bin/bash
   just -f {{justfile()}} create-builder || true
-  if [ -z "$WORKBENCH_SESSION_INIT_VERSION" ]; then
-    WORKBENCH_SESSION_INIT_VERSION=$(just -f ci.Justfile get-version workbench --type=daily --local)
-  fi
   GIT_SHA=$(git rev-parse --short HEAD) \
-  WORKBENCH_SESSION_INIT_VERSION=${WORKBENCH_SESSION_INIT_VERSION} \
     docker buildx bake --builder=posit-builder -f docker-bake.hcl {{target}}
 
 # just preview-bake workbench-images dev
@@ -93,12 +88,7 @@ preview-plan branch="$(git branch --show-current)":
 
 # just test workbench
 test target="default" file="docker-bake.hcl":
-  #!/bin/bash
-  if [ -z "$WORKBENCH_SESSION_INIT_VERSION" ]; then
-    WORKBENCH_SESSION_INIT_VERSION=$(just -f ci.Justfile get-version workbench --type=daily --local)
-  fi
   GIT_SHA=$(git rev-parse --short HEAD) \
-  WORKBENCH_SESSION_INIT_VERSION=${WORKBENCH_SESSION_INIT_VERSION} \
     python3 {{justfile_directory()}}/tools/test_bake_artifacts.py --target "{{target}}" --file "{{file}}"
 
 # just preview-test connect dev

diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -4,15 +4,11 @@ variable CONNECT_VERSION {
 }
 
 variable PACKAGE_MANAGER_VERSION {
-    default = "2024.08.2-9"
+    default = "2024.11.0-7"
 }
 
 variable WORKBENCH_VERSION {
-    default = "2024.09.1+394.pro7"
-}
-
-variable WORKBENCH_SESSION_INIT_VERSION {
-    default = ""
+    default = "2024.12.0+467.pro1"
 }
 
 variable DRIVERS_VERSION {
@@ -500,16 +496,16 @@ target "workbench-session-init" {
     inherits = ["base"]
     target = "build"
 
-    name = "workbench-session-init-${builds.os}-${replace(tag_safe_version(WORKBENCH_SESSION_INIT_VERSION), ".", "-")}"
-    tags = get_tags(builds.os, "workbench-session-init", WORKBENCH_SESSION_INIT_VERSION)
+    name = "workbench-session-init-${builds.os}-${replace(tag_safe_version(WORKBENCH_VERSION), ".", "-")}"
+    tags = get_tags(builds.os, "workbench-session-init", WORKBENCH_VERSION)
 
     dockerfile = "Dockerfile.${builds.os}"
     context = "workbench-session-init"
 
     matrix = WORKBENCH_SESSION_INIT_BUILD_MATRIX
 
     args = {
-        RSW_VERSION = WORKBENCH_SESSION_INIT_VERSION
+        RSW_VERSION = WORKBENCH_VERSION
     }
 }
 

diff --git a/package-manager/.env b/package-manager/.env
@@ -1,4 +1,4 @@
-RSPM_VERSION=2024.08.2-9
+RSPM_VERSION=2024.11.0-7
 R_VERSION=4.4.0
 R_VERSION_ALT=4.1.3
 PYTHON_VERSION=3.9.17

diff --git a/package-manager/Dockerfile.ubuntu2204 b/package-manager/Dockerfile.ubuntu2204
@@ -18,7 +18,7 @@ RUN apt-get update -qq && apt-get install -y --no-install-recommends \
     apt-get clean && rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
 
 # Download RStudio Package Manager ---------------------------------------------#
-ARG RSPM_VERSION=2024.08.2-9
+ARG RSPM_VERSION=2024.11.0-7
 ARG RSPM_DOWNLOAD_URL=https://cdn.rstudio.com/package-manager/deb/amd64
 RUN curl -fsSL -O ${RSPM_DOWNLOAD_URL}/rstudio-pm_${RSPM_VERSION}_amd64.deb \
     # Pre 7/25/23 packages

diff --git a/r-session-complete/.env b/r-session-complete/.env
@@ -1,4 +1,4 @@
 R_VERSION=4.1.0
 PYTHON_VERSION=3.9.5
-RSW_VERSION=2024.09.1+394.pro7
+RSW_VERSION=2024.12.0+467.pro1
 DRIVERS_VERSION=2024.03.0-1
diff --git a/r-session-complete/Dockerfile.ubuntu2204 b/r-session-complete/Dockerfile.ubuntu2204
@@ -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.1+394.pro7
+ARG RSW_VERSION=2024.12.0+467.pro1
 ARG RSW_NAME=rstudio-workbench
 ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64
 ARG SCRIPTS_DIR=/opt/positscripts

diff --git a/r-session-complete/README.md b/r-session-complete/README.md
@@ -7,7 +7,7 @@
 
 # Supported tags and respective Dockerfile links
 
-* [`jammy`, `ubuntu2204`, `jammy-2024.09.1`, `ubuntu2204-2024.09.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/r-session-complete/Dockerfile.ubuntu2204)
+* [`jammy`, `ubuntu2204`, `jammy-2024.12.0`, `ubuntu2204-2024.12.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/r-session-complete/Dockerfile.ubuntu2204)
 
 # What are the r-session-complete images?
 

diff --git a/workbench-for-google-cloud-workstations/.env b/workbench-for-google-cloud-workstations/.env
@@ -1,5 +1,5 @@
-RSW_VERSION=2024.09.1+394.pro7
-RSW_TAG_VERSION=2024.09.1-394.pro7
+RSW_VERSION=2024.12.0+467.pro1
+RSW_TAG_VERSION=2024.12.0-467.pro1
 RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64
 RSW_NAME=rstudio-workbench
 PYTHON_VERSION=3.11.9

diff --git a/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204 b/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204
@@ -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.1+394.pro7
+ARG RSW_VERSION=2024.12.0+467.pro1
 ARG RSW_NAME=rstudio-workbench
 ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64
 ARG SCRIPTS_DIR=/opt/positscripts

diff --git a/workbench-for-microsoft-azure-ml/.env b/workbench-for-microsoft-azure-ml/.env
@@ -1,4 +1,4 @@
-RSW_VERSION=2024.09.1+394.pro7
+RSW_VERSION=2024.12.0+467.pro1
 RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/bionic/amd64
 RSW_NAME=rstudio-workbench
 PYTHON_VERSION=3.9.14

diff --git a/workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204 b/workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204
@@ -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.1+394.pro7
+ARG RSW_VERSION=2024.12.0+467.pro1
 ARG RSW_NAME=rstudio-workbench
 ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64
 ARG SCRIPTS_DIR=/opt/positscripts
@@ -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.1+394.pro7' \
+     org.opencontainers.image.version='2024.12.0+467.pro1' \
      org.opencontainers.image.url='https://www.rstudio.com/products/workbench/'
diff --git a/workbench-session-init/Dockerfile.ubuntu2204 b/workbench-session-init/Dockerfile.ubuntu2204
@@ -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.1+394.pro7
+ARG RSW_VERSION=2024.12.0+467.pro1
 ARG GO_VERSION=1.22.2
 
 # Download the RStudio Workbench session components and install Go

diff --git a/workbench/.env b/workbench/.env
@@ -1,4 +1,4 @@
-RSW_VERSION=2024.09.1+394.pro7
+RSW_VERSION=2024.12.0+467.pro1
 RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/bionic/amd64
 RSW_NAME=rstudio-workbench
 PYTHON_VERSION=3.9.17

diff --git a/workbench/Dockerfile.ubuntu2204 b/workbench/Dockerfile.ubuntu2204
@@ -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.1+394.pro7
+ARG RSW_VERSION=2024.12.0+467.pro1
 ARG RSW_NAME=rstudio-workbench
 ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/jammy/amd64
 ARG SCRIPTS_DIR=/opt/positscripts

diff --git a/workbench/README.md b/workbench/README.md
@@ -7,7 +7,7 @@
 
 # Supported tags and respective Dockerfile links
 
-* [`jammy`, `ubuntu2204`, `jammy-2024.09.1`, `ubuntu2204-2024.09.1`](https://github.com/rstudio/rstudio-docker-products/blob/main/workbench/Dockerfile.ubuntu2204)
+* [`jammy`, `ubuntu2204`, `jammy-2024.12.0`, `ubuntu2204-2024.12.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/workbench/Dockerfile.ubuntu2204)
 
 # What is RStudio Workbench?