Merge branch 'dev' into rl9-customer-images

rstudio · Feb 26, 2024 · a91fb5e · a91fb5e
2 parents 2dd06a9 + 74129c8
commit a91fb5e
Show file tree

Hide file tree

Showing 45 changed files with 105 additions and 92 deletions.
diff --git a/.github/workflows/build-prerelease.yaml b/.github/workflows/build-prerelease.yaml
@@ -30,7 +30,7 @@ jobs:
           - {product: "workbench", type: "preview", os: "ubuntu2204", r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.17", py-alternate: "3.8.17"}
           - {product: "connect", type: "daily", os: "ubuntu2204", r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.17", py-alternate: "3.8.17"}
           - {product: "connect-content-init", type: "daily", os: "ubuntu2204", r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.17", py-alternate: "3.8.17"}
-          - {product: "package-manager", type: "daily", os: "ubuntu2204", r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.17", py-alternate: "3.8.17"}
+          - {product: "package-manager", type: "daily", os: "ubuntu2204", r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.12.1", py-alternate: "3.11.7"}
           - {product: "r-session-complete", type: "daily", os: "ubuntu2204", r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.17", py-alternate: "3.8.17"}
           - {product: "r-session-complete", type: "daily", os: 'centos7', r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.14", py-alternate: "3.8.15"}
           - {product: "r-session-complete", type: "preview", os: "ubuntu2204", r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.17", py-alternate: "3.8.17"}

diff --git a/.github/workflows/build-release.yaml b/.github/workflows/build-release.yaml
@@ -30,6 +30,7 @@ jobs:
           - {os: 'ubuntu2204', r-primary: "4.2.0", r-alternate: "3.6.2", py-primary: "3.9.5", py-alternate: "3.8.10"}
           - {os: 'ubuntu2204', r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.14", py-alternate: "3.8.15"}
           - {os: 'ubuntu2204', r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.17", py-alternate: "3.8.17"}
+          - {os: 'ubuntu2204', r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.12.1", py-alternate: "3.11.7"}
 
     steps:
       - name: Check Out Repo - cron main
@@ -138,6 +139,7 @@ jobs:
           - {os: 'ubuntu2204', r-primary: "4.2.0", r-alternate: "3.6.2", py-primary: "3.9.5", py-alternate: "3.8.10"}
           - {os: 'ubuntu2204', r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.14", py-alternate: "3.8.15"}
           - {os: 'ubuntu2204', r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.17", py-alternate: "3.8.17"}
+          - {os: 'ubuntu2204', r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.12.1", py-alternate: "3.11.7"}
 
     concurrency:
       group: build-base-pro-${{ matrix.config.os }}-r${{ matrix.config.r-primary }}_${{ matrix.config.r-alternate }}-py${{ matrix.config.py-primary }}_${{ matrix.config.py-alternate }}-${{ github.ref }}
@@ -248,7 +250,7 @@ jobs:
           - {product: 'workbench', os: 'ubuntu2204', r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.14", py-alternate: "3.8.15"}
           - {product: 'connect', os: 'ubuntu2204', r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.17", py-alternate: "3.8.17"}
           - {product: 'connect-content-init', os: 'ubuntu2204', r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.17", py-alternate: "3.8.17"}
-          - {product: 'package-manager', os: 'ubuntu2204', r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.17", py-alternate: "3.8.17"}
+          - {product: 'package-manager', os: 'ubuntu2204', r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.12.1", py-alternate: "3.11.7"}
           - {product: 'r-session-complete', os: 'centos7', r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.14", py-alternate: "3.8.15"}
           - {product: 'r-session-complete', os: 'ubuntu2204', r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.14", py-alternate: "3.8.15"}
           - {product: 'workbench-for-microsoft-azure-ml', os: 'ubuntu2204', r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.14", py-alternate: "3.8.15"}

diff --git a/.github/workflows/build-workbench-gcw.yaml b/.github/workflows/build-workbench-gcw.yaml
@@ -5,7 +5,6 @@ on:
     branches:
       - main
       - dev
-      - workbench-gcw-push-errors  # TODO: remove this branch once we've fixed the push errors
   pull_request:
 
 name: Workbench for GCW - Build, Test, Scan, and Push
@@ -69,7 +68,7 @@ jobs:
           product: workbench-for-google-cloud-workstations
           image-tags: ${{ steps.get-tags.outputs.IMAGE_TAGS }}
           build-args: ${{ steps.get-build-args.outputs.BUILD_ARGS }}
-          push-image: ${{ github.ref == 'refs/heads/main' || github.event.schedule == '0 14 * * 1' || github.ref == 'refs/heads/workbench-gcw-push-errors' }}
+          push-image: ${{ github.ref == 'refs/heads/main' || github.event.schedule == '0 14 * * 1' }}
           snyk-token: ${{ secrets.SNYK_TOKEN }}
           snyk-org-id: ${{ secrets.SNYK_ORG_ID }}
           ghcr-token: ${{ secrets.GITHUB_TOKEN }}
@@ -93,7 +92,7 @@ jobs:
           product: workbench-for-google-cloud-workstations
           image-tags: ${{ steps.get-tags.outputs.IMAGE_TAGS }}
           build-args: ${{ steps.get-build-args.outputs.BUILD_ARGS }}
-          push-image: ${{ github.ref == 'refs/heads/main' || github.event.schedule == '0 14 * * 1' || github.ref == 'refs/heads/workbench-gcw-push-errors' }}
+          push-image: ${{ github.ref == 'refs/heads/main' || github.event.schedule == '0 14 * * 1' }}
           snyk-token: ${{ secrets.SNYK_TOKEN }}
           snyk-org-id: ${{ secrets.SNYK_ORG_ID }}
           ghcr-token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/Justfile b/Justfile
@@ -6,9 +6,9 @@ sed_vars := if os() == "macos" { "-i ''" } else { "-i" }
 
 BUILDX_PATH := ""
 
-RSC_VERSION := "2023.10.0"
-RSPM_VERSION := "2023.08.4-20"
-RSW_VERSION := "2023.09.1+494.pro2"
+RSC_VERSION := "2024.01.0"
+RSPM_VERSION := "2023.12.0-13"
+RSW_VERSION := "2023.12.1+402.pro1"
 
 DRIVERS_VERSION := "2023.05.0"
 DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1"
@@ -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:
@@ -126,7 +126,6 @@ update-rspm-versions:
   set -euxo pipefail
   sed {{ sed_vars }} "s/RSPM_VERSION=.*/RSPM_VERSION={{ RSPM_VERSION }}/g" \
     package-manager/.env \
-    package-manager/Dockerfile.ubuntu1804 \
     package-manager/Dockerfile.ubuntu2204
   sed {{ sed_vars }} "s/RSPM_VERSION:.*/RSPM_VERSION: {{ RSPM_VERSION }}/g" docker-compose.yml
   sed {{ sed_vars }} "s/rstudio\/rstudio-package-manager:.*/rstudio\/rstudio-package-manager:$(just _get-clean-version {{ RSPM_VERSION }})/g" docker-compose.yml

diff --git a/NEWS.md b/NEWS.md
@@ -5,6 +5,10 @@ changed in each image.
 
 This file only captures pervasive, repository-wide changes.
 
+# 2024-02-01
+
+- Update Pro Drivers to 2023.12.1
+
 # 2023-08-07
 
 - Removed base image Ubuntu 18.04 builds.

diff --git a/ci.Justfile b/ci.Justfile
@@ -9,7 +9,7 @@ R_VERSION_ALT := "4.1.3"
 PYTHON_VERSION := "3.9.17"
 PYTHON_VERSION_ALT := "3.8.17"
 
-DRIVERS_VERSION := "2023.05.0"
+DRIVERS_VERSION := "2023.12.1"
 DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1"
 
 QUARTO_VERSION := "1.3.340"

diff --git a/connect-content-init/Dockerfile.ubuntu2204 b/connect-content-init/Dockerfile.ubuntu2204
@@ -10,7 +10,7 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends ca-certificates curl && \
     rm -rf /var/lib/apt/lists/*
 
-ARG RSC_VERSION=2023.10.0
+ARG RSC_VERSION=2024.01.0
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN mkdir -p /rsc-staging && \
     RSC_VERSION_URL=$(echo -n "${RSC_VERSION}" | sed 's/+/%2B/g') && \

diff --git a/connect-content-init/Justfile b/connect-content-init/Justfile
@@ -6,7 +6,7 @@ IMAGE_PREFIX := "rstudio-"
 PRODUCT := "connect-content-init"
 IMAGE_OS := "ubuntu2204"
 
-RSC_VERSION := "2023.10.0"
+RSC_VERSION := "2024.01.0"
 RSC_TAG_SAFE_VERSION := replace(RSC_VERSION, "+", "-")
 RSC_LICENSE := ""
 

diff --git a/connect-content-init/README.md b/connect-content-init/README.md
@@ -9,7 +9,7 @@
 
 # Supported tags and respective Dockerfile links
 
-* [`jammy`, `ubuntu2204`, `jammy-2023.10.0`, `ubuntu2204-2023.10.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)
+* [`jammy`, `ubuntu2204`, `jammy-2024.01.0`, `ubuntu2204-2024.01.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)
 
 # RStudio Connect Content Init Container
 
@@ -31,7 +31,7 @@ The version of the release package to use can be overridden with the
 `RSC_VERSION` build arg.
 
 ```console
-just build ubuntu2204 2023.10.0
+just build ubuntu2204 2024.01.0
 ```
 
 ## Testing
@@ -56,7 +56,7 @@ just test
 You can see the different layers that make up the image:
 
 ```console
-docker history rstudio/rstudio-connect-content-init-preview:2023.10.0-dev-326
+docker history rstudio/rstudio-connect-content-init-preview:2024.01.0-dev-326
 ```
 
 NOTE: almost all the image size is pandoc.

diff --git a/connect/.env b/connect/.env
@@ -1,4 +1,4 @@
-RSC_VERSION=2023.10.0
+RSC_VERSION=2024.01.0
 R_VERSION=4.2.3
 R_VERSION_ALT=4.1.3
 PYTHON_VERSION=3.9.17

diff --git a/connect/Dockerfile.ubuntu2204 b/connect/Dockerfile.ubuntu2204
@@ -13,7 +13,7 @@ ARG R_VERSION=4.2.3
 ARG R_VERSION_ALT=4.1.3
 ARG PYTHON_VERSION=3.9.17
 ARG PYTHON_VERSION_ALT=3.8.17
-ARG RSC_VERSION=2023.10.0
+ARG RSC_VERSION=2024.01.0
 SHELL [ "/bin/bash", "-o", "pipefail", "-c"]
 RUN apt-get update --fix-missing \
     && apt-get install -yq --no-install-recommends \

diff --git a/connect/Justfile b/connect/Justfile
@@ -6,7 +6,7 @@ IMAGE_PREFIX := "rstudio-"
 PRODUCT := "connect"
 IMAGE_OS := "ubuntu2204"
 
-RSC_VERSION := "2023.10.0"
+RSC_VERSION := "2024.01.0"
 RSC_LICENSE := ""
 RSC_LICENSE_SERVER := ""
 

diff --git a/connect/README.md b/connect/README.md
@@ -7,7 +7,7 @@
 
 # Supported tags and respective Dockerfile links
 
-* [`jammy`, `ubuntu2204`, `jammy-2023.10.0`, `ubuntu2204-2023.10.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)
+* [`jammy`, `ubuntu2204`, `jammy-2024.01.0`, `ubuntu2204-2024.01.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)
 
 # What is Posit Connect?
 

diff --git a/content/matrix.json b/content/matrix.json
@@ -1,23 +1,23 @@
 [
-  {"r": "3.1.3", "py": "2.7.18", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "3.2.5", "py": "2.7.18", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "3.3.3", "py": "3.6.13", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "3.4.4", "py": "3.6.13", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "3.4.4", "py": "3.7.10", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "3.5.3", "py": "2.7.18", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "3.5.3", "py": "3.7.10", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "3.6.3", "py": "2.7.18", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "3.6.3", "py": "3.6.13", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "3.6.3", "py": "3.8.8", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "4.0.5", "py": "3.6.13", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "4.0.5", "py": "3.7.10", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "4.0.5", "py": "3.8.8", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "4.0.5", "py": "3.9.2", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "4.1.0", "py": "3.8.8", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "4.1.0", "py": "3.9.2", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "4.1.3", "py": "3.10.4", "drivers": "2023.05.0", "os": "ubuntu1804", "os_alt": "bionic"},
-  {"r": "3.6.3", "py": "3.8.16", "drivers": "2023.05.0", "os": "ubuntu2204", "os_alt": "jammy"},
-  {"r": "4.0.5", "py": "3.9.16", "drivers": "2023.05.0", "os": "ubuntu2204", "os_alt": "jammy"},
-  {"r": "4.1.3", "py": "3.10.11", "drivers": "2023.05.0", "os": "ubuntu2204", "os_alt": "jammy"},
-  {"r": "4.2.2", "py": "3.11.3", "drivers": "2023.05.0", "os": "ubuntu2204", "os_alt": "jammy"}
+  {"r": "3.1.3", "py": "2.7.18", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "3.2.5", "py": "2.7.18", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "3.3.3", "py": "3.6.13", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "3.4.4", "py": "3.6.13", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "3.4.4", "py": "3.7.10", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "3.5.3", "py": "2.7.18", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "3.5.3", "py": "3.7.10", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "3.6.3", "py": "2.7.18", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "3.6.3", "py": "3.6.13", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "3.6.3", "py": "3.8.8", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "4.0.5", "py": "3.6.13", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "4.0.5", "py": "3.7.10", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "4.0.5", "py": "3.8.8", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "4.0.5", "py": "3.9.2", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "4.1.0", "py": "3.8.8", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "4.1.0", "py": "3.9.2", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "4.1.3", "py": "3.10.4", "drivers": "2023.12.1", "os": "ubuntu1804", "os_alt": "bionic"},
+  {"r": "3.6.3", "py": "3.8.16", "drivers": "2023.12.1", "os": "ubuntu2204", "os_alt": "jammy"},
+  {"r": "4.0.5", "py": "3.9.16", "drivers": "2023.12.1", "os": "ubuntu2204", "os_alt": "jammy"},
+  {"r": "4.1.3", "py": "3.10.11", "drivers": "2023.12.1", "os": "ubuntu2204", "os_alt": "jammy"},
+  {"r": "4.2.2", "py": "3.11.3", "drivers": "2023.12.1", "os": "ubuntu2204", "os_alt": "jammy"}
 ]
diff --git a/content/pro/Dockerfile.ubuntu1804 b/content/pro/Dockerfile.ubuntu1804
@@ -6,7 +6,7 @@ FROM ${REGISTRY}/rstudio/content-base:r${R_VERSION}-py${PYTHON_VERSION}-ubuntu18
 LABEL maintainer="RStudio Docker <[email protected]>"
 
 # Install RStudio Professional Drivers ----------------------------------------#
-ARG DRIVERS_VERSION=2023.05.0
+ARG DRIVERS_VERSION=2023.12.1
 ARG R_VERSION
 ARG DEBIAN_FRONTEND=noninteractive
 

diff --git a/content/pro/Dockerfile.ubuntu2204 b/content/pro/Dockerfile.ubuntu2204
@@ -6,7 +6,7 @@ FROM ${REGISTRY}/rstudio/content-base:r${R_VERSION}-py${PYTHON_VERSION}-ubuntu22
 LABEL maintainer="RStudio Docker <[email protected]>"
 
 # Install RStudio Professional Drivers ----------------------------------------#
-ARG DRIVERS_VERSION=2023.05.0
+ARG DRIVERS_VERSION=2023.12.1
 ARG R_VERSION
 ARG DEBIAN_FRONTEND=noninteractive
 

diff --git a/content/pro/Justfile b/content/pro/Justfile
@@ -10,7 +10,7 @@ R_VERSION := "3.6.3"
 
 PYTHON_VERSION := "3.9.5"
 
-DRIVERS_VERSION := "2023.05.0"
+DRIVERS_VERSION := "2023.12.1"
 DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1"
 
 DEFAULT_TAG := IMAGE_PREFIX + PRODUCT + ":r" + R_VERSION + "-py" + PYTHON_VERSION + "-" + IMAGE_OS

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -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.1+402.pro1
+    image: rstudio/rstudio-workbench:2023.12.0
     environment:
       RSW_LICENSE: ${RSW_LICENSE}
       LICENSE_SERVER: ${RSW_LICENSE_SERVER}
@@ -25,8 +25,8 @@ services:
       context: ./connect
       dockerfile: "Dockerfile.${IMAGE_OS:-ubuntu1804}"
       args:
-        RSC_VERSION: 2023.10.0
-    image: rstudio/rstudio-connect:2023.10.0
+        RSC_VERSION: 2024.01.0
+    image: rstudio/rstudio-connect:2024.01.0
     privileged: true
     environment:
       RSC_LICENSE: ${RSC_LICENSE}
@@ -43,8 +43,8 @@ services:
       context: ./package-manager
       dockerfile: "Dockerfile.${IMAGE_OS:-ubuntu2204}"
       args:
-        RSPM_VERSION: 2023.08.4-20
-    image: rstudio/rstudio-package-manager:2023.08.4
+        RSPM_VERSION: 2023.12.0-13
+    image: rstudio/rstudio-package-manager:2023.12.0
     environment:
       RSPM_LICENSE: ${RSPM_LICENSE}
       LICENSE_SERVER: ${RSPM_LICENSE_SERVER}

diff --git a/package-manager/.env b/package-manager/.env
@@ -1,4 +1,4 @@
-RSPM_VERSION=2023.08.4-20
+RSPM_VERSION=2023.12.0-13
 R_VERSION=4.2.3
 R_VERSION_ALT=4.1.3
 PYTHON_VERSION=3.9.17

diff --git a/package-manager/Dockerfile.ubuntu2204 b/package-manager/Dockerfile.ubuntu2204
@@ -1,7 +1,7 @@
 ARG R_VERSION=4.2.3
 ARG R_VERSION_ALT=4.1.3
-ARG PYTHON_VERSION=3.9.17
-ARG PYTHON_VERSION_ALT=3.8.17
+ARG PYTHON_VERSION=3.12.1
+ARG PYTHON_VERSION_ALT=3.11.7
 ARG SRC_IMAGE_NAME=product-base
 ARG REGISTRY=ghcr.io
 FROM ${REGISTRY}/rstudio/${SRC_IMAGE_NAME}:ubuntu2204-r${R_VERSION}_${R_VERSION_ALT}-py${PYTHON_VERSION}_${PYTHON_VERSION_ALT}
@@ -20,7 +20,7 @@ RUN /opt/python/${PYTHON_VERSION}/bin/python3 -m pip install --no-cache-dir buil
 RUN /opt/python/${PYTHON_VERSION_ALT}/bin/python3 -m pip install --no-cache-dir build virtualenv
 
 # Download RStudio Package Manager ---------------------------------------------#
-ARG RSPM_VERSION=2023.08.4-20
+ARG RSPM_VERSION=2023.12.0-13
 ARG RSPM_DOWNLOAD_URL=https://cdn.rstudio.com/package-manager/deb/amd64
 RUN curl -O ${RSPM_DOWNLOAD_URL}/rstudio-pm_${RSPM_VERSION}_amd64.deb \
     # Pre 7/25/23 packages

diff --git a/package-manager/Justfile b/package-manager/Justfile
@@ -6,15 +6,15 @@ IMAGE_PREFIX := "rstudio-"
 PRODUCT := "package-manager"
 IMAGE_OS := "ubuntu2204"
 
-RSPM_VERSION := "2023.08.4-20"
+RSPM_VERSION := "2023.12.0-13"
 RSPM_LICENSE := ""
 RSPM_LICENSE_SERVER := ""
 
 R_VERSION := "4.2.3"
 R_VERSION_ALT := "4.1.3"
 
-PYTHON_VERSION := "3.9.17"
-PYTHON_VERSION_ALT := "3.8.17"
+PYTHON_VERSION := "3.12.1"
+PYTHON_VERSION_ALT := "3.11.7"
 
 PERSIST_LICENSE := "false"
 PERSIST_LICENSE_DIR := join(justfile_directory(), "tmp-lic")

diff --git a/package-manager/NEWS.md b/package-manager/NEWS.md
@@ -1,3 +1,6 @@
+# 2024-01-11
+- Update Python to 3.12.1
+
 # 2023-11-20
 - Add Python
 - Update R to 4.2.3
@@ -7,7 +10,7 @@
 - Removed Launcher references. Package manager no longer uses the Job Launcher for building git packages.
 
 # 2023-07-25
-- Changed `rstudio-pm.gcfg` R version number behavior from statically defined to dynamically filled on build. 
+- Changed `rstudio-pm.gcfg` R version number behavior from statically defined to dynamically filled on build.
 
 # 2022.11.4-20
 

diff --git a/package-manager/README.md b/package-manager/README.md
@@ -6,7 +6,7 @@
 
 # Supported tags and respective Dockerfile links
 
-* [`jammy`, `ubuntu2204`, `jammy-2023.08.4`, `ubuntu2204-2023.08.4`](https://github.com/rstudio/rstudio-docker-products/blob/main/package-manager/Dockerfile.ubuntu2204)
+* [`jammy`, `ubuntu2204`, `jammy-2023.12.0`, `ubuntu2204-2023.12.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/package-manager/Dockerfile.ubuntu2204)
 
 # What is RStudio Package Manager?
 

diff --git a/product/pro/Dockerfile.centos7 b/product/pro/Dockerfile.centos7
@@ -11,7 +11,7 @@ ARG R_VERSION=4.2.0
 ARG R_VERSION_ALT=3.6.2
 ARG PYTHON_VERSION=3.9.14
 ARG PYTHON_VERSION_ALT=3.8.15
-ARG DRIVERS_VERSION=2023.05.0-1
+ARG DRIVERS_VERSION=2023.12.1-1
 
 RUN yum update -y \
     && yum install -y unixODBC unixODBC-devel \

diff --git a/product/pro/Dockerfile.ubuntu2204 b/product/pro/Dockerfile.ubuntu2204
@@ -12,7 +12,7 @@ ARG R_VERSION=4.2.3
 ARG R_VERSION_ALT=4.1.3
 ARG PYTHON_VERSION=3.9.17
 ARG PYTHON_VERSION_ALT=3.8.17
-ARG DRIVERS_VERSION=2023.05.0
+ARG DRIVERS_VERSION=2023.12.1
 
 RUN apt-get update \
     && apt-get install -yq --no-install-recommends unixodbc unixodbc-dev \

diff --git a/product/pro/Justfile b/product/pro/Justfile
@@ -16,7 +16,7 @@ PYTHON_VERSION_ALT := "3.8.17"
 TINI_VERSION := "0.19.0"
 QUARTO_VERSION := "1.3.340"
 
-DRIVERS_VERSION := "2023.05.0"
+DRIVERS_VERSION := "2023.12.1"
 DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1"
 
 _make-default-tag OS=IMAGE_OS:

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
-DRIVERS_VERSION=2023.05.0-1
-RSW_VERSION=2023.09.1+494.pro2
+RSW_VERSION=2023.12.1+402.pro1
+DRIVERS_VERSION=2023.12.1-1