Skip to content

Commit e0135b3

Browse files
committed
RHAIENG-389: Change RStudio base-image to AIPCC
Begin by using the provided AIPCC base image and the copr of rstudio-server-dependencies to pass-through dnf upgrade. In the meantime, we are installing other dependencies using mirror.stream.centos.org while we await the final working AIPCC image.
1 parent 731c89f commit e0135b3

File tree

2 files changed

+19
-8
lines changed

2 files changed

+19
-8
lines changed

rstudio/c9s-python-3.12/Dockerfile.cpu

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@ FROM ${BASE_IMAGE} AS cpu-base
1212

1313
WORKDIR /opt/app-root/bin
1414

15-
# Install micropipenv and uv to deploy packages from requirements.txt begin
16-
RUN pip install --no-cache-dir -U "micropipenv[toml]==1.9.0" "uv==0.8.12"
17-
# Install micropipenv and uv to deploy packages from requirements.txt end
18-
1915
# OS Packages needs to be installed as root
2016
USER root
2117

18+
# Enable copr, so we can do dnf upgrade
19+
RUN dnf copr enable copr.devel.redhat.com/mcurlej/rstudio-server-dependencies rhel-9-x86_64 -y
20+
2221
# upgrade first to avoid fixable vulnerabilities begin
2322
# Problem: The operation would result in removing the following protected packages: systemd
2423
# (try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages)
@@ -60,10 +59,18 @@ USER 0
6059

6160
ENV R_VERSION=4.5.1
6261

62+
# Use CentOS while we are still waiting on final AIPCC image
63+
RUN dnf config-manager --add-repo https://mirror.stream.centos.org/9-stream/BaseOS/x86_64/os/
64+
RUN dnf config-manager --add-repo https://mirror.stream.centos.org/9-stream/AppStream/x86_64/os/
65+
RUN dnf config-manager --add-repo https://mirror.stream.centos.org/9-stream/CRB/x86_64/os/
66+
RUN dnf makecache
67+
RUN rpm --import https://www.centos.org/keys/RPM-GPG-KEY-CentOS-Official
68+
69+
# This package causes issues with openssl installation
70+
RUN rpm -e openssl-fips-provider-so --nodeps
71+
6372
# Install R
64-
RUN dnf install -y 'dnf-command(config-manager)' && \
65-
dnf config-manager --set-enabled crb && \
66-
dnf install -y https://download.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
73+
RUN dnf install -y https://download.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
6774
INSTALL_PKGS="R-core R-core-devel R-java R-Rcpp R-highlight \
6875
R-littler R-littler-examples openssl-libs compat-openssl11" && \
6976
dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
@@ -83,6 +90,10 @@ RUN chmod -R a+w ${LIBLOC} && \
8390
WORKDIR /tmp/
8491
COPY /rstudio/utils /tmp/utils
8592

93+
# npm required by ./cve_remediation.sh
94+
RUN dnf module enable nodejs:22 -y
95+
RUN dnf install nodejs npm -y
96+
8697
# Install RStudio
8798
ARG RSTUDIO_RPM=rstudio-server-rhel-2025.09.0-387-x86_64.rpm
8899
RUN wget --progress=dot:giga https://download2.rstudio.org/server/rhel9/x86_64/${RSTUDIO_RPM} && \
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
BASE_IMAGE=quay.io/sclorg/python-312-c9s:c9s
1+
BASE_IMAGE=quay.io/aipcc/base-images/cpu:3.0

0 commit comments

Comments
 (0)