diff --git a/Justfile b/Justfile index 64c5622e..3740c700 100644 --- a/Justfile +++ b/Justfile @@ -7,7 +7,7 @@ sed_vars := if os() == "macos" { "-i ''" } else { "-i" } BUILDX_PATH := "" RSC_VERSION := "2023.12.0" -RSPM_VERSION := "2023.08.4-20" +RSPM_VERSION := "2023.12.0-13" RSW_VERSION := "2023.12.0+369.pro3" 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 index 12c53891..e656a904 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -43,8 +43,8 @@ services: context: ./package-manager dockerfile: "Dockerfile.${IMAGE_OS:-ubuntu1804}" 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 index 0cd44ebc..ce131756 100644 --- a/package-manager/.env +++ b/package-manager/.env @@ -1,3 +1,3 @@ -RSPM_VERSION=2023.08.4-20 +RSPM_VERSION=2023.12.0-13 R_VERSION=4.2.3 R_VERSION_ALT=4.1.3 diff --git a/package-manager/Dockerfile.ubuntu2204 b/package-manager/Dockerfile.ubuntu2204 index a6fc4966..f570f285 100644 --- a/package-manager/Dockerfile.ubuntu2204 +++ b/package-manager/Dockerfile.ubuntu2204 @@ -44,7 +44,7 @@ RUN apt-get update -qq && \ && rm -rf /var/lib/apt/lists/* # 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 apt-get update --fix-missing \ && apt-get install -y --no-install-recommends ca-certificates gdebi-core gpg dpkg-sig \ diff --git a/package-manager/Justfile b/package-manager/Justfile index 7f99e5fc..0aebeef1 100644 --- 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 index e396b11f..e1e57518 100644 --- a/package-manager/README.md +++ b/package-manager/README.md @@ -6,8 +6,7 @@ # Supported tags and respective Dockerfile links -* [`2023.08.4`, `bionic`, `ubuntu1804`, `bionic-2023.08.4`, `ubuntu1804-2023.08.4`](https://github.com/rstudio/rstudio-docker-products/blob/main/package-manager/Dockerfile.ubuntu1804) -* [`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?