From 9cf4a2b3f319e7c29befb8e622d6afeaddd51506 Mon Sep 17 00:00:00 2001 From: "Benjamin R. J. Schwedler" Date: Thu, 5 Sep 2024 09:05:15 -0500 Subject: [PATCH 1/3] Change Domain for P3M to posit.co Several configurations were using the rstudio.com domain --- connect/rstudio-connect.gcfg | 4 ++-- content/base/Dockerfile.ubuntu1804 | 2 +- content/base/Dockerfile.ubuntu2204 | 2 +- product/base/scripts/rhel/install_r.sh | 2 +- product/base/scripts/ubuntu/install_r.sh | 2 +- workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204 | 2 +- workbench-for-microsoft-azure-ml/conf/repos.conf | 2 +- workbench-for-microsoft-azure-ml/deps/install-r.sh | 4 ++-- workbench/conf/repos.conf | 4 ++-- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/connect/rstudio-connect.gcfg b/connect/rstudio-connect.gcfg index 13312664..65bc8105 100644 --- a/connect/rstudio-connect.gcfg +++ b/connect/rstudio-connect.gcfg @@ -42,10 +42,10 @@ Enabled = true Executable = /usr/bin/tensorflow_model_server [RPackageRepository "CRAN"] -URL = https://packagemanager.rstudio.com/cran/__linux__/jammy/latest +URL = https://packagemanager.posit.co/cran/__linux__/jammy/latest [RPackageRepository "RSPM"] -URL = https://packagemanager.rstudio.com/cran/__linux__/jammy/latest +URL = https://packagemanager.posit.co/cran/__linux__/jammy/latest [Logging] ServiceLog = STDOUT diff --git a/content/base/Dockerfile.ubuntu1804 b/content/base/Dockerfile.ubuntu1804 index 87c2d09e..9c9efb81 100644 --- a/content/base/Dockerfile.ubuntu1804 +++ b/content/base/Dockerfile.ubuntu1804 @@ -125,6 +125,6 @@ RUN curl -fsSL -o miniconda.sh https://repo.anaconda.com/miniconda/Miniconda3-${ # install quarto ARG QUARTO_VERSION=1.0.37 COPY maybe_install_quarto.sh /tmp/maybe_install_quarto.sh -RUN /opt/R/${R_VERSION}/bin/R -e 'install.packages("odbc", repos="https://packagemanager.rstudio.com/cran/__linux__/bionic/latest")' \ +RUN /opt/R/${R_VERSION}/bin/R -e 'install.packages("odbc", repos="https://packagemanager.posit.co/cran/__linux__/bionic/latest")' \ && /tmp/maybe_install_quarto.sh \ && rm -f /tmp/maybe_install_quarto.sh diff --git a/content/base/Dockerfile.ubuntu2204 b/content/base/Dockerfile.ubuntu2204 index 241df921..9397dfb8 100644 --- a/content/base/Dockerfile.ubuntu2204 +++ b/content/base/Dockerfile.ubuntu2204 @@ -119,6 +119,6 @@ RUN curl -fsSL -O https://cdn.rstudio.com/python/${DISTRIBUTION}/pkgs/python-${P # install quarto ARG QUARTO_VERSION=1.3.340 COPY maybe_install_quarto.sh /tmp/maybe_install_quarto.sh -RUN /opt/R/${R_VERSION}/bin/R -e 'install.packages("odbc", repos="https://packagemanager.rstudio.com/cran/__linux__/bionic/latest")' \ +RUN /opt/R/${R_VERSION}/bin/R -e 'install.packages("odbc", repos="https://packagemanager.posit.co/cran/__linux__/bionic/latest")' \ && /tmp/maybe_install_quarto.sh \ && rm -f /tmp/maybe_install_quarto.sh diff --git a/product/base/scripts/rhel/install_r.sh b/product/base/scripts/rhel/install_r.sh index 1dc254f2..76f28669 100755 --- a/product/base/scripts/rhel/install_r.sh +++ b/product/base/scripts/rhel/install_r.sh @@ -130,7 +130,7 @@ install_r_packages() { fi echo "$d$d Installing R-${R_VERSION} packages from ${R_PKG_FILE} $d$d" - local cran_repo="https://packagemanager.rstudio.com/cran/__linux__/${DISTRO}${OS_VERSION}/latest" + local cran_repo="https://packagemanager.posit.co/cran/__linux__/${DISTRO}${OS_VERSION}/latest" $R_BIN --vanilla --no-echo < /dev/null install.packages(readLines("$R_PKG_FILE"), repos = "$cran_repo") diff --git a/product/base/scripts/ubuntu/install_r.sh b/product/base/scripts/ubuntu/install_r.sh index 98d48745..306d953c 100755 --- a/product/base/scripts/ubuntu/install_r.sh +++ b/product/base/scripts/ubuntu/install_r.sh @@ -136,7 +136,7 @@ install_r_packages() { fi echo "$d$d Installing R-${R_VERSION} packages from ${R_PKG_FILE} $d$d" - local cran_repo="https://packagemanager.rstudio.com/cran/__linux__/${UBUNTU_CODENAME}/latest" + local cran_repo="https://packagemanager.posit.co/cran/__linux__/${UBUNTU_CODENAME}/latest" $R_BIN --vanilla --no-echo < /dev/null install.packages(readLines("$R_PKG_FILE"), repos = "$cran_repo", clean = TRUE) diff --git a/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204 b/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204 index d32b72fe..d62faba0 100644 --- a/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204 +++ b/workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204 @@ -75,7 +75,7 @@ RUN ${SCRIPTS_DIR}/apt.sh --update upgrade \ && DRIVERS_VERSION=${DRIVERS_VERSION} ${SCRIPTS_DIR}/install_drivers.sh \ && ${SCRIPTS_DIR}/apt.sh --clean \ && cp /opt/rstudio-drivers/odbcinst.ini.sample /etc/odbcinst.ini \ - && /opt/R/${R_VERSION}/bin/R -e 'install.packages("odbc", repos="https://packagemanager.rstudio.com/cran/__linux__/jammy/latest")' + && /opt/R/${R_VERSION}/bin/R -e 'install.packages("odbc", repos="https://packagemanager.posit.co/cran/__linux__/jammy/latest")' ### Install Workbench ### SHELL ["/bin/bash", "-o", "pipefail", "-c"] diff --git a/workbench-for-microsoft-azure-ml/conf/repos.conf b/workbench-for-microsoft-azure-ml/conf/repos.conf index 5745e36c..f80e3772 100644 --- a/workbench-for-microsoft-azure-ml/conf/repos.conf +++ b/workbench-for-microsoft-azure-ml/conf/repos.conf @@ -1 +1 @@ -CRAN=https://packagemanager.rstudio.com/cran/__linux__/jammy/latest +CRAN=https://packagemanager.posit.co/cran/__linux__/jammy/latest diff --git a/workbench-for-microsoft-azure-ml/deps/install-r.sh b/workbench-for-microsoft-azure-ml/deps/install-r.sh index 4fccb829..41dec5e4 100755 --- a/workbench-for-microsoft-azure-ml/deps/install-r.sh +++ b/workbench-for-microsoft-azure-ml/deps/install-r.sh @@ -18,7 +18,7 @@ install_r_packages() { # passing a CRAN repo as third arg will install from that repo, in this case however, # we are using the RStudio public package manager so we can install from binaries and not source # this speeds everything up dramatically - local CRAN_REPO=${3:-"https://packagemanager.rstudio.com/cran/__linux__/${UBUNTU_CODENAME}/latest"} + local CRAN_REPO=${3:-"https://packagemanager.posit.co/cran/__linux__/${UBUNTU_CODENAME}/latest"} # create an R matrix-style string of packages local r_packages=$(awk '{print "\"" $0 "\""}' "$1" | paste -d',' -s -) @@ -36,5 +36,5 @@ for rvers in 4.0.5 4.1.3 4.2.3 4.3.2; do rm -f ./r-${rvers}_1_amd64.deb # install packages - install_r_packages /tmp/r_packages.txt /opt/R/${rvers}/bin/R https://packagemanager.rstudio.com/cran/__linux__/${UBUNTU_CODENAME}/latest + install_r_packages /tmp/r_packages.txt /opt/R/${rvers}/bin/R https://packagemanager.posit.co/cran/__linux__/${UBUNTU_CODENAME}/latest done diff --git a/workbench/conf/repos.conf b/workbench/conf/repos.conf index e0a56fc0..39b07032 100644 --- a/workbench/conf/repos.conf +++ b/workbench/conf/repos.conf @@ -1,2 +1,2 @@ -RSPM=https://packagemanager.rstudio.com/cran/__linux__/jammy/latest -CRAN=https://packagemanager.rstudio.com/cran/__linux__/jammy/latest +RSPM=https://packagemanager.posit.co/cran/__linux__/jammy/latest +CRAN=https://packagemanager.posit.co/cran/__linux__/jammy/latest From 97acde2a540d122c29a4d4558c5ef4f11e562ca2 Mon Sep 17 00:00:00 2001 From: "Benjamin R. J. Schwedler" Date: Thu, 5 Sep 2024 09:07:23 -0500 Subject: [PATCH 2/3] Use jammy P3M repo for Ubuntu 22.04 content image --- content/base/Dockerfile.ubuntu2204 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/base/Dockerfile.ubuntu2204 b/content/base/Dockerfile.ubuntu2204 index 9397dfb8..1317741e 100644 --- a/content/base/Dockerfile.ubuntu2204 +++ b/content/base/Dockerfile.ubuntu2204 @@ -119,6 +119,6 @@ RUN curl -fsSL -O https://cdn.rstudio.com/python/${DISTRIBUTION}/pkgs/python-${P # install quarto ARG QUARTO_VERSION=1.3.340 COPY maybe_install_quarto.sh /tmp/maybe_install_quarto.sh -RUN /opt/R/${R_VERSION}/bin/R -e 'install.packages("odbc", repos="https://packagemanager.posit.co/cran/__linux__/bionic/latest")' \ +RUN /opt/R/${R_VERSION}/bin/R -e 'install.packages("odbc", repos="https://packagemanager.posit.co/cran/__linux__/jammy/latest")' \ && /tmp/maybe_install_quarto.sh \ && rm -f /tmp/maybe_install_quarto.sh From 41f7c8292f39554a5987f8c1b4b3c7ba1af01c80 Mon Sep 17 00:00:00 2001 From: Jonathan Yoder Date: Fri, 20 Sep 2024 10:09:12 -0400 Subject: [PATCH 3/3] Bump PPM to 2024.08.2-9 --- Justfile | 2 +- docker-bake.hcl | 2 +- package-manager/.env | 2 +- package-manager/Dockerfile.ubuntu2204 | 2 +- package-manager/README.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Justfile b/Justfile index fc43e484..7faebea0 100644 --- a/Justfile +++ b/Justfile @@ -8,7 +8,7 @@ sed_vars := if os() == "macos" { "-i ''" } else { "-i" } BUILDX_PATH := "" RSC_VERSION := "2024.08.0" -RSPM_VERSION := "2024.08.0-6" +RSPM_VERSION := "2024.08.2-9" RSW_VERSION := "2024.04.2+764.pro1" DRIVERS_VERSION := "2023.05.0" diff --git a/docker-bake.hcl b/docker-bake.hcl index f583d3fe..8309c0ef 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -4,7 +4,7 @@ variable CONNECT_VERSION { } variable PACKAGE_MANAGER_VERSION { - default = "2024.08.0-6" + default = "2024.08.2-9" } variable WORKBENCH_VERSION { diff --git a/package-manager/.env b/package-manager/.env index 0900bba0..11b0a634 100644 --- a/package-manager/.env +++ b/package-manager/.env @@ -1,4 +1,4 @@ -RSPM_VERSION=2024.08.0-6 +RSPM_VERSION=2024.08.2-9 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 index 58dd04a4..771c5a75 100644 --- a/package-manager/Dockerfile.ubuntu2204 +++ b/package-manager/Dockerfile.ubuntu2204 @@ -13,7 +13,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=2024.08.0-6 +ARG RSPM_VERSION=2024.08.2-9 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/package-manager/README.md b/package-manager/README.md index a1c44242..c458dd12 100644 --- a/package-manager/README.md +++ b/package-manager/README.md @@ -6,7 +6,7 @@ # Supported tags and respective Dockerfile links -* [`jammy`, `ubuntu2204`, `jammy-2024.08.0`, `ubuntu2204-2024.08.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/package-manager/Dockerfile.ubuntu2204) +* [`jammy`, `ubuntu2204`, `jammy-2024.08.2`, `ubuntu2204-2024.08.2`](https://github.com/rstudio/rstudio-docker-products/blob/main/package-manager/Dockerfile.ubuntu2204) # What is RStudio Package Manager?