Merge pull request #133 from rstudio/rhel10

glin · web-flow · commit 59fc3dc2ba1c · 2025-07-23T17:00:57.000-05:00
Add images for Rocky Linux 10
diff --git a/4.0/rockylinux10/Dockerfile b/4.0/rockylinux10/Dockerfile
@@ -0,0 +1,27 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+ARG BASE_IMAGE=posit/r-base
+FROM ${BASE_IMAGE}:rockylinux10
+
+ARG R_VERSION=4.0.5
+ARG OS_IDENTIFIER=rhel-10
+
+# Install R
+RUN wget "https://cdn.posit.co/r/${OS_IDENTIFIER}/pkgs/R-${R_VERSION}-1-1.$(arch).rpm" && \
+    dnf -y install dnf-plugins-core && \
+    dnf config-manager --set-enabled crb && \
+    dnf -y install epel-release && \
+    dnf -y install "./R-${R_VERSION}-1-1.$(arch).rpm" && \
+    ln -s "/opt/R/${R_VERSION}/bin/R" /usr/bin/R && \
+    ln -s "/opt/R/${R_VERSION}/bin/Rscript" /usr/bin/Rscript && \
+    ln -s "/opt/R/${R_VERSION}/lib/R" /usr/lib/R && \
+    rm "R-${R_VERSION}-1-1.$(arch).rpm" && \
+    dnf -y remove epel-release && \
+    dnf config-manager --set-disabled crb && \
+    dnf clean all
+
+CMD ["R"]
diff --git a/4.0/rockylinux10/version.txt b/4.0/rockylinux10/version.txt
@@ -0,0 +1 @@
+4.0.5
diff --git a/4.1/rockylinux10/Dockerfile b/4.1/rockylinux10/Dockerfile
@@ -0,0 +1,27 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+ARG BASE_IMAGE=posit/r-base
+FROM ${BASE_IMAGE}:rockylinux10
+
+ARG R_VERSION=4.1.3
+ARG OS_IDENTIFIER=rhel-10
+
+# Install R
+RUN wget "https://cdn.posit.co/r/${OS_IDENTIFIER}/pkgs/R-${R_VERSION}-1-1.$(arch).rpm" && \
+    dnf -y install dnf-plugins-core && \
+    dnf config-manager --set-enabled crb && \
+    dnf -y install epel-release && \
+    dnf -y install "./R-${R_VERSION}-1-1.$(arch).rpm" && \
+    ln -s "/opt/R/${R_VERSION}/bin/R" /usr/bin/R && \
+    ln -s "/opt/R/${R_VERSION}/bin/Rscript" /usr/bin/Rscript && \
+    ln -s "/opt/R/${R_VERSION}/lib/R" /usr/lib/R && \
+    rm "R-${R_VERSION}-1-1.$(arch).rpm" && \
+    dnf -y remove epel-release && \
+    dnf config-manager --set-disabled crb && \
+    dnf clean all
+
+CMD ["R"]
diff --git a/4.1/rockylinux10/version.txt b/4.1/rockylinux10/version.txt
@@ -0,0 +1 @@
+4.1.3
diff --git a/4.2/rockylinux10/Dockerfile b/4.2/rockylinux10/Dockerfile
@@ -0,0 +1,27 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+ARG BASE_IMAGE=posit/r-base
+FROM ${BASE_IMAGE}:rockylinux10
+
+ARG R_VERSION=4.2.3
+ARG OS_IDENTIFIER=rhel-10
+
+# Install R
+RUN wget "https://cdn.posit.co/r/${OS_IDENTIFIER}/pkgs/R-${R_VERSION}-1-1.$(arch).rpm" && \
+    dnf -y install dnf-plugins-core && \
+    dnf config-manager --set-enabled crb && \
+    dnf -y install epel-release && \
+    dnf -y install "./R-${R_VERSION}-1-1.$(arch).rpm" && \
+    ln -s "/opt/R/${R_VERSION}/bin/R" /usr/bin/R && \
+    ln -s "/opt/R/${R_VERSION}/bin/Rscript" /usr/bin/Rscript && \
+    ln -s "/opt/R/${R_VERSION}/lib/R" /usr/lib/R && \
+    rm "R-${R_VERSION}-1-1.$(arch).rpm" && \
+    dnf -y remove epel-release && \
+    dnf config-manager --set-disabled crb && \
+    dnf clean all
+
+CMD ["R"]
diff --git a/4.2/rockylinux10/version.txt b/4.2/rockylinux10/version.txt
@@ -0,0 +1 @@
+4.2.3
diff --git a/4.3/rockylinux10/Dockerfile b/4.3/rockylinux10/Dockerfile
@@ -0,0 +1,27 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+ARG BASE_IMAGE=posit/r-base
+FROM ${BASE_IMAGE}:rockylinux10
+
+ARG R_VERSION=4.3.3
+ARG OS_IDENTIFIER=rhel-10
+
+# Install R
+RUN wget "https://cdn.posit.co/r/${OS_IDENTIFIER}/pkgs/R-${R_VERSION}-1-1.$(arch).rpm" && \
+    dnf -y install dnf-plugins-core && \
+    dnf config-manager --set-enabled crb && \
+    dnf -y install epel-release && \
+    dnf -y install "./R-${R_VERSION}-1-1.$(arch).rpm" && \
+    ln -s "/opt/R/${R_VERSION}/bin/R" /usr/bin/R && \
+    ln -s "/opt/R/${R_VERSION}/bin/Rscript" /usr/bin/Rscript && \
+    ln -s "/opt/R/${R_VERSION}/lib/R" /usr/lib/R && \
+    rm "R-${R_VERSION}-1-1.$(arch).rpm" && \
+    dnf -y remove epel-release && \
+    dnf config-manager --set-disabled crb && \
+    dnf clean all
+
+CMD ["R"]
diff --git a/4.3/rockylinux10/version.txt b/4.3/rockylinux10/version.txt
@@ -0,0 +1 @@
+4.3.3
diff --git a/4.4/rockylinux10/Dockerfile b/4.4/rockylinux10/Dockerfile
@@ -0,0 +1,27 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+ARG BASE_IMAGE=posit/r-base
+FROM ${BASE_IMAGE}:rockylinux10
+
+ARG R_VERSION=4.4.3
+ARG OS_IDENTIFIER=rhel-10
+
+# Install R
+RUN wget "https://cdn.posit.co/r/${OS_IDENTIFIER}/pkgs/R-${R_VERSION}-1-1.$(arch).rpm" && \
+    dnf -y install dnf-plugins-core && \
+    dnf config-manager --set-enabled crb && \
+    dnf -y install epel-release && \
+    dnf -y install "./R-${R_VERSION}-1-1.$(arch).rpm" && \
+    ln -s "/opt/R/${R_VERSION}/bin/R" /usr/bin/R && \
+    ln -s "/opt/R/${R_VERSION}/bin/Rscript" /usr/bin/Rscript && \
+    ln -s "/opt/R/${R_VERSION}/lib/R" /usr/lib/R && \
+    rm "R-${R_VERSION}-1-1.$(arch).rpm" && \
+    dnf -y remove epel-release && \
+    dnf config-manager --set-disabled crb && \
+    dnf clean all
+
+CMD ["R"]
diff --git a/4.4/rockylinux10/version.txt b/4.4/rockylinux10/version.txt
@@ -0,0 +1 @@
+4.4.3
diff --git a/4.5/rockylinux10/Dockerfile b/4.5/rockylinux10/Dockerfile
@@ -0,0 +1,27 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+ARG BASE_IMAGE=posit/r-base
+FROM ${BASE_IMAGE}:rockylinux10
+
+ARG R_VERSION=4.5.1
+ARG OS_IDENTIFIER=rhel-10
+
+# Install R
+RUN wget "https://cdn.posit.co/r/${OS_IDENTIFIER}/pkgs/R-${R_VERSION}-1-1.$(arch).rpm" && \
+    dnf -y install dnf-plugins-core && \
+    dnf config-manager --set-enabled crb && \
+    dnf -y install epel-release && \
+    dnf -y install "./R-${R_VERSION}-1-1.$(arch).rpm" && \
+    ln -s "/opt/R/${R_VERSION}/bin/R" /usr/bin/R && \
+    ln -s "/opt/R/${R_VERSION}/bin/Rscript" /usr/bin/Rscript && \
+    ln -s "/opt/R/${R_VERSION}/lib/R" /usr/lib/R && \
+    rm "R-${R_VERSION}-1-1.$(arch).rpm" && \
+    dnf -y remove epel-release && \
+    dnf config-manager --set-disabled crb && \
+    dnf clean all
+
+CMD ["R"]
diff --git a/4.5/rockylinux10/version.txt b/4.5/rockylinux10/version.txt
@@ -0,0 +1 @@
+4.5.1
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 BASE_IMAGE ?= posit/r-base
 VERSIONS ?= 3.1 3.2 3.3 3.4 3.5 3.6 4.0 4.1 4.2 4.3 4.4 4.5 devel next
-VARIANTS ?= focal jammy noble bookworm centos7 rockylinux8 rockylinux9 opensuse156
+VARIANTS ?= focal jammy noble bookworm centos7 rockylinux8 rockylinux9 rockylinux10 opensuse156
 
 # PATCH_VERSIONS defines all actively maintained R patch versions.
 PATCH_VERSIONS ?= 3.1.3 3.2.5 3.3.3 3.4.4 3.5.3 \
@@ -74,16 +74,18 @@ PUSH_R_IMAGES += push-$(version)-$(variant)
 PUSH_MULTIARCH_R_IMAGES += push-multiarch-$(version)-$(variant)
 endef
 
+define minor_version
+$(shell echo $(version) | cut -d. -f-2)
+endef
+
 $(foreach variant,$(VARIANTS), \
   $(foreach version,$(VERSIONS), \
-    $(eval $(GEN_R_IMAGE_TARGETS)) \
+    $(if $(wildcard $(minor_version)/$(variant)), \
+      $(eval $(GEN_R_IMAGE_TARGETS)) \
+    ) \
   ) \
 )
 
-define minor_version
-$(shell echo $(version) | cut -d. -f-2)
-endef
-
 define GEN_R_PATCH_IMAGE_TARGETS
 build-$(version)-$(variant): build-base-$(variant)
 	docker build -t $(BASE_IMAGE):$(version)-$(variant) \
@@ -127,7 +129,9 @@ endef
 
 $(foreach variant,$(VARIANTS), \
   $(foreach version,$(PATCH_VERSIONS), \
-    $(eval $(GEN_R_PATCH_IMAGE_TARGETS)) \
+    $(if $(wildcard $(minor_version)/$(variant)), \
+      $(eval $(GEN_R_PATCH_IMAGE_TARGETS)) \
+    ) \
   ) \
 )
 
diff --git a/README.md b/README.md
@@ -54,6 +54,7 @@ The following distributions are supported for both `x86_64`/`amd64` and `aarch64
 | centos7       | CentOS 7* |
 | rockylinux8   | Rocky Linux 8 |
 | rockylinux9   | Rocky Linux 9 |
+| rockylinux10  | Rocky Linux 10 |
 | opensuse156   | openSUSE 15.6 |
 
 All minor versions of R since 3.1 are supported, on the latest patch release.
diff --git a/base/rockylinux10/Dockerfile b/base/rockylinux10/Dockerfile
@@ -0,0 +1,34 @@
+FROM rockylinux/rockylinux:10
+LABEL maintainer="Posit Docker <docker@posit.co>"
+
+RUN dnf -y update && \
+    dnf -y install \
+    fontconfig \
+    glibc-langpack-en \
+    perl-File-Find \
+    sudo \
+    vim \
+    wget && \
+    dnf clean all
+
+# Install TinyTeX
+RUN wget -qO- "https://yihui.org/tinytex/install-bin-unix.sh" | sh && \
+    /root/.TinyTeX/bin/*/tlmgr path remove && \
+    mv /root/.TinyTeX/ /opt/TinyTeX && \
+    /opt/TinyTeX/bin/*/tlmgr option sys_bin /usr/local/bin && \
+    /opt/TinyTeX/bin/*/tlmgr path add
+
+# Install Pandoc
+ARG PANDOC_VERSION=2.19.2
+RUN ARCH=$([ "$(arch)" = "aarch64" ] && echo "arm64" || echo "amd64") && \
+    wget "https://github.com/jgm/pandoc/releases/download/${PANDOC_VERSION}/pandoc-${PANDOC_VERSION}-linux-${ARCH}.tar.gz" -O pandoc.tar.gz && \
+    tar -xvf pandoc.tar.gz && \
+    mv "pandoc-${PANDOC_VERSION}" /opt/pandoc && \
+    ln -s /opt/pandoc/bin/pandoc /usr/local/bin/pandoc && \
+    rm pandoc.tar.gz
+
+# Set default locale
+ENV LANG en_US.UTF-8
+
+# Set default timezone
+ENV TZ UTC
diff --git a/devel/rockylinux10/Dockerfile b/devel/rockylinux10/Dockerfile
@@ -0,0 +1,27 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+ARG BASE_IMAGE=posit/r-base
+FROM ${BASE_IMAGE}:rockylinux10
+
+ARG R_VERSION=devel
+ARG OS_IDENTIFIER=rhel-10
+
+# Install R
+RUN wget "https://cdn.posit.co/r/${OS_IDENTIFIER}/pkgs/R-${R_VERSION}-1-1.$(arch).rpm" && \
+    dnf -y install dnf-plugins-core && \
+    dnf config-manager --set-enabled crb && \
+    dnf -y install epel-release && \
+    dnf -y install "./R-${R_VERSION}-1-1.$(arch).rpm" && \
+    ln -s "/opt/R/${R_VERSION}/bin/R" /usr/bin/R && \
+    ln -s "/opt/R/${R_VERSION}/bin/Rscript" /usr/bin/Rscript && \
+    ln -s "/opt/R/${R_VERSION}/lib/R" /usr/lib/R && \
+    rm "R-${R_VERSION}-1-1.$(arch).rpm" && \
+    dnf -y remove epel-release && \
+    dnf config-manager --set-disabled crb && \
+    dnf clean all
+
+CMD ["R"]
diff --git a/devel/rockylinux10/version.txt b/devel/rockylinux10/version.txt
@@ -0,0 +1 @@
+devel
diff --git a/next/rockylinux10/Dockerfile b/next/rockylinux10/Dockerfile
@@ -0,0 +1,27 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+ARG BASE_IMAGE=posit/r-base
+FROM ${BASE_IMAGE}:rockylinux10
+
+ARG R_VERSION=next
+ARG OS_IDENTIFIER=rhel-10
+
+# Install R
+RUN wget "https://cdn.posit.co/r/${OS_IDENTIFIER}/pkgs/R-${R_VERSION}-1-1.$(arch).rpm" && \
+    dnf -y install dnf-plugins-core && \
+    dnf config-manager --set-enabled crb && \
+    dnf -y install epel-release && \
+    dnf -y install "./R-${R_VERSION}-1-1.$(arch).rpm" && \
+    ln -s "/opt/R/${R_VERSION}/bin/R" /usr/bin/R && \
+    ln -s "/opt/R/${R_VERSION}/bin/Rscript" /usr/bin/Rscript && \
+    ln -s "/opt/R/${R_VERSION}/lib/R" /usr/lib/R && \
+    rm "R-${R_VERSION}-1-1.$(arch).rpm" && \
+    dnf -y remove epel-release && \
+    dnf config-manager --set-disabled crb && \
+    dnf clean all
+
+CMD ["R"]
diff --git a/next/rockylinux10/version.txt b/next/rockylinux10/version.txt
@@ -0,0 +1 @@
+next
diff --git a/update.sh b/update.sh
@@ -26,6 +26,7 @@ declare -A os_identifiers=(
     [centos7]='centos-7'
     [rockylinux8]='centos-8'
     [rockylinux9]='rhel-9'
+    [rockylinux10]='rhel-10'
     [opensuse156]='opensuse-156'
 )
 
@@ -42,6 +43,12 @@ generated_warning() {
 
 for version in "${!r_versions[@]}"; do
     for variant in "${!os_identifiers[@]}"; do
+        # R 3.x versions are not supported on Rocky Linux 10
+        major=$(cut -d '.' -f1 <<< "$version")
+        if [[ "$variant" == "rockylinux10" ]] && [ "$major" == "3" ]; then
+            continue
+        fi
+
         dir="$version/$variant"
 
         mkdir -p $dir
@@ -53,7 +60,7 @@ for version in "${!r_versions[@]}"; do
             ;;
             centos7|rockylinux8) template='centos'
             ;;
-            rockylinux9) template='rockylinux'
+            rockylinux9|rockylinux10) template='rockylinux'
             ;;
             opensuse156) template='opensuse'
             ;;
