Skip to content

Commit 73ee692

Browse files
jonyoderjonyoder
authored
Merge pull request #842 from rstudio/dev
Merge dev to main for PPM 2024.08.2-9
2 parents 2988d13 + 2819226 commit 73ee692

File tree

14 files changed

+17
-17
lines changed

14 files changed

+17
-17
lines changed

‎Justfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ sed_vars := if os() == "macos" { "-i ''" } else { "-i" }
88
BUILDX_PATH := ""
99

1010
RSC_VERSION := "2024.08.0"
11-
RSPM_VERSION := "2024.08.0-6"
11+
RSPM_VERSION := "2024.08.2-9"
1212
RSW_VERSION := "2024.04.2+764.pro1"
1313

1414
DRIVERS_VERSION := "2023.05.0"

‎connect/rstudio-connect.gcfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ Enabled = true
4242
Executable = /usr/bin/tensorflow_model_server
4343

4444
[RPackageRepository "CRAN"]
45-
URL = https://packagemanager.rstudio.com/cran/__linux__/jammy/latest
45+
URL = https://packagemanager.posit.co/cran/__linux__/jammy/latest
4646

4747
[RPackageRepository "RSPM"]
48-
URL = https://packagemanager.rstudio.com/cran/__linux__/jammy/latest
48+
URL = https://packagemanager.posit.co/cran/__linux__/jammy/latest
4949

5050
[Logging]
5151
ServiceLog = STDOUT

‎content/base/Dockerfile.ubuntu1804

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,6 @@ RUN curl -fsSL -o miniconda.sh https://repo.anaconda.com/miniconda/Miniconda3-${
125125
# install quarto
126126
ARG QUARTO_VERSION=1.0.37
127127
COPY maybe_install_quarto.sh /tmp/maybe_install_quarto.sh
128-
RUN /opt/R/${R_VERSION}/bin/R -e 'install.packages("odbc", repos="https://packagemanager.rstudio.com/cran/__linux__/bionic/latest")' \
128+
RUN /opt/R/${R_VERSION}/bin/R -e 'install.packages("odbc", repos="https://packagemanager.posit.co/cran/__linux__/bionic/latest")' \
129129
&& /tmp/maybe_install_quarto.sh \
130130
&& rm -f /tmp/maybe_install_quarto.sh

‎content/base/Dockerfile.ubuntu2204

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,6 @@ RUN curl -fsSL -O https://cdn.rstudio.com/python/${DISTRIBUTION}/pkgs/python-${P
119119
# install quarto
120120
ARG QUARTO_VERSION=1.3.340
121121
COPY maybe_install_quarto.sh /tmp/maybe_install_quarto.sh
122-
RUN /opt/R/${R_VERSION}/bin/R -e 'install.packages("odbc", repos="https://packagemanager.rstudio.com/cran/__linux__/bionic/latest")' \
122+
RUN /opt/R/${R_VERSION}/bin/R -e 'install.packages("odbc", repos="https://packagemanager.posit.co/cran/__linux__/jammy/latest")' \
123123
&& /tmp/maybe_install_quarto.sh \
124124
&& rm -f /tmp/maybe_install_quarto.sh

‎docker-bake.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ variable CONNECT_VERSION {
44
}
55

66
variable PACKAGE_MANAGER_VERSION {
7-
default = "2024.08.0-6"
7+
default = "2024.08.2-9"
88
}
99

1010
variable WORKBENCH_VERSION {

‎package-manager/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
RSPM_VERSION=2024.08.0-6
1+
RSPM_VERSION=2024.08.2-9
22
R_VERSION=4.4.0
33
R_VERSION_ALT=4.1.3
44
PYTHON_VERSION=3.9.17

‎package-manager/Dockerfile.ubuntu2204

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ RUN /opt/python/${PYTHON_VERSION}/bin/python3 -m pip install --no-cache-dir buil
1313
RUN /opt/python/${PYTHON_VERSION_ALT}/bin/python3 -m pip install --no-cache-dir build virtualenv
1414

1515
# Download RStudio Package Manager ---------------------------------------------#
16-
ARG RSPM_VERSION=2024.08.0-6
16+
ARG RSPM_VERSION=2024.08.2-9
1717
ARG RSPM_DOWNLOAD_URL=https://cdn.rstudio.com/package-manager/deb/amd64
1818
RUN curl -fsSL -O ${RSPM_DOWNLOAD_URL}/rstudio-pm_${RSPM_VERSION}_amd64.deb \
1919
# Pre 7/25/23 packages

‎package-manager/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
# Supported tags and respective Dockerfile links
88

9-
* [`jammy`, `ubuntu2204`, `jammy-2024.08.0`, `ubuntu2204-2024.08.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/package-manager/Dockerfile.ubuntu2204)
9+
* [`jammy`, `ubuntu2204`, `jammy-2024.08.2`, `ubuntu2204-2024.08.2`](https://github.com/rstudio/rstudio-docker-products/blob/main/package-manager/Dockerfile.ubuntu2204)
1010

1111
# What is RStudio Package Manager?
1212

‎product/base/scripts/rhel/install_r.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ install_r_packages() {
130130
fi
131131

132132
echo "$d$d Installing R-${R_VERSION} packages from ${R_PKG_FILE} $d$d"
133-
local cran_repo="https://packagemanager.rstudio.com/cran/__linux__/${DISTRO}${OS_VERSION}/latest"
133+
local cran_repo="https://packagemanager.posit.co/cran/__linux__/${DISTRO}${OS_VERSION}/latest"
134134

135135
$R_BIN --vanilla --no-echo <<EOF > /dev/null
136136
install.packages(readLines("$R_PKG_FILE"), repos = "$cran_repo")

‎product/base/scripts/ubuntu/install_r.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ install_r_packages() {
136136
fi
137137

138138
echo "$d$d Installing R-${R_VERSION} packages from ${R_PKG_FILE} $d$d"
139-
local cran_repo="https://packagemanager.rstudio.com/cran/__linux__/${UBUNTU_CODENAME}/latest"
139+
local cran_repo="https://packagemanager.posit.co/cran/__linux__/${UBUNTU_CODENAME}/latest"
140140

141141
$R_BIN --vanilla --no-echo <<EOF > /dev/null
142142
install.packages(readLines("$R_PKG_FILE"), repos = "$cran_repo", clean = TRUE)

‎workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ RUN ${SCRIPTS_DIR}/apt.sh --update upgrade \
7575
&& DRIVERS_VERSION=${DRIVERS_VERSION} ${SCRIPTS_DIR}/install_drivers.sh \
7676
&& ${SCRIPTS_DIR}/apt.sh --clean \
7777
&& cp /opt/rstudio-drivers/odbcinst.ini.sample /etc/odbcinst.ini \
78-
&& /opt/R/${R_VERSION}/bin/R -e 'install.packages("odbc", repos="https://packagemanager.rstudio.com/cran/__linux__/jammy/latest")'
78+
&& /opt/R/${R_VERSION}/bin/R -e 'install.packages("odbc", repos="https://packagemanager.posit.co/cran/__linux__/jammy/latest")'
7979

8080
### Install Workbench ###
8181
SHELL ["/bin/bash", "-o", "pipefail", "-c"]

‎workbench-for-microsoft-azure-ml/conf/repos.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
CRAN=https://packagemanager.rstudio.com/cran/__linux__/jammy/latest
1+
CRAN=https://packagemanager.posit.co/cran/__linux__/jammy/latest

‎workbench-for-microsoft-azure-ml/deps/install-r.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ install_r_packages() {
1818
# passing a CRAN repo as third arg will install from that repo, in this case however,
1919
# we are using the RStudio public package manager so we can install from binaries and not source
2020
# this speeds everything up dramatically
21-
local CRAN_REPO=${3:-"https://packagemanager.rstudio.com/cran/__linux__/${UBUNTU_CODENAME}/latest"}
21+
local CRAN_REPO=${3:-"https://packagemanager.posit.co/cran/__linux__/${UBUNTU_CODENAME}/latest"}
2222

2323
# create an R matrix-style string of packages
2424
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
3636
rm -f ./r-${rvers}_1_amd64.deb
3737

3838
# install packages
39-
install_r_packages /tmp/r_packages.txt /opt/R/${rvers}/bin/R https://packagemanager.rstudio.com/cran/__linux__/${UBUNTU_CODENAME}/latest
39+
install_r_packages /tmp/r_packages.txt /opt/R/${rvers}/bin/R https://packagemanager.posit.co/cran/__linux__/${UBUNTU_CODENAME}/latest
4040
done

‎workbench/conf/repos.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
RSPM=https://packagemanager.rstudio.com/cran/__linux__/jammy/latest
2-
CRAN=https://packagemanager.rstudio.com/cran/__linux__/jammy/latest
1+
RSPM=https://packagemanager.posit.co/cran/__linux__/jammy/latest
2+
CRAN=https://packagemanager.posit.co/cran/__linux__/jammy/latest

0 commit comments

Comments
 (0)