Merge pull request #835 from rstudio/package-manager-posit-co

Change domain for P3M to posit.co
rstudio · Sep 17, 2024 · a934a2e · a934a2e
2 parents 49a3855 + 97acde2
commit a934a2e
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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__/jammy/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
@@ -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 <<EOF > /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
@@ -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 <<EOF > /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
@@ -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
@@ -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
@@ -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
@@ -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
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		CRAN=https://packagemanager.rstudio.com/cran/__linux__/jammy/latest
		CRAN=https://packagemanager.posit.co/cran/__linux__/jammy/latest