Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge dev to main for PPM 2024.08.2-9 #842

Merged
merged 5 commits into from
Sep 20, 2024
Merged

Merge dev to main for PPM 2024.08.2-9 #842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9cf4a2b
Change Domain for P3M to posit.co
bschwedler Sep 5, 2024
97acde2
Use jammy P3M repo for Ubuntu 22.04 content image
bschwedler Sep 5, 2024
a934a2e
Merge pull request #835 from rstudio/package-manager-posit-co
bschwedler Sep 17, 2024
41f7c82
Bump PPM to 2024.08.2-9
jonyoder Sep 20, 2024
2819226
Merge pull request #841 from rstudio/jon-ppm-2024.08.2
jonyoder Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions connect/rstudio-connect.gcfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion content/base/Dockerfile.ubuntu1804
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion content/base/Dockerfile.ubuntu2204
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ variable CONNECT_VERSION {
}

variable PACKAGE_MANAGER_VERSION {
default = "2024.08.0-6"
default = "2024.08.2-9"
}

variable WORKBENCH_VERSION {
Expand Down
2 changes: 1 addition & 1 deletion package-manager/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion package-manager/Dockerfile.ubuntu2204
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package-manager/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?

Expand Down
2 changes: 1 addition & 1 deletion product/base/scripts/rhel/install_r.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion product/base/scripts/ubuntu/install_r.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion workbench-for-google-cloud-workstations/Dockerfile.ubuntu2204
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion workbench-for-microsoft-azure-ml/conf/repos.conf
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions workbench-for-microsoft-azure-ml/deps/install-r.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -)
Expand All @@ -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
4 changes: 2 additions & 2 deletions workbench/conf/repos.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading