Merge pull request #674 from rstudio/jmw/2023.12.0

update Package Manager version to 2023.12.0-13
rstudio · Dec 18, 2023 · 01d0813 · 01d0813
2 parents 5e6e11a + fee2306
commit 01d0813
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 8 deletions.
diff --git a/Justfile b/Justfile
@@ -7,7 +7,7 @@ sed_vars := if os() == "macos" { "-i ''" } else { "-i" }
 BUILDX_PATH := ""
 
 RSC_VERSION := "2023.10.0"
-RSPM_VERSION := "2023.08.4-20"
+RSPM_VERSION := "2023.12.0-13"
 RSW_VERSION := "2023.09.1+494.pro2"
 
 DRIVERS_VERSION := "2023.05.0"
@@ -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/docker-compose.yml b/docker-compose.yml
@@ -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
@@ -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,7 +6,7 @@ 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 := ""
 

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?