Add support for Ubuntu 26.04 Resolute

nodivbyzero · nodivbyzero · commit 2e7f7ac47f4f · 2026-04-14T18:09:22.000-07:00
diff --git a/4.0/resolute/Dockerfile b/4.0/resolute/Dockerfile
@@ -0,0 +1,23 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+ARG BASE_IMAGE=posit/r-base
+FROM ${BASE_IMAGE}:resolute
+
+ARG R_VERSION=4.0.5
+ARG OS_IDENTIFIER=ubuntu-2604
+
+# Install R
+RUN wget "https://cdn.posit.co/r/${OS_IDENTIFIER}/pkgs/r-${R_VERSION}_1_$(dpkg --print-architecture).deb" && \
+    apt-get update -qq && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -f -y "./r-${R_VERSION}_1_$(dpkg --print-architecture).deb" && \
+    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_$(dpkg --print-architecture).deb" && \
+    rm -rf /var/lib/apt/lists/*
+
+CMD ["R"]
diff --git a/4.0/resolute/version.txt b/4.0/resolute/version.txt
@@ -0,0 +1 @@
+4.0.5
diff --git a/4.1/resolute/Dockerfile b/4.1/resolute/Dockerfile
@@ -0,0 +1,23 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+ARG BASE_IMAGE=posit/r-base
+FROM ${BASE_IMAGE}:resolute
+
+ARG R_VERSION=4.1.3
+ARG OS_IDENTIFIER=ubuntu-2604
+
+# Install R
+RUN wget "https://cdn.posit.co/r/${OS_IDENTIFIER}/pkgs/r-${R_VERSION}_1_$(dpkg --print-architecture).deb" && \
+    apt-get update -qq && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -f -y "./r-${R_VERSION}_1_$(dpkg --print-architecture).deb" && \
+    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_$(dpkg --print-architecture).deb" && \
+    rm -rf /var/lib/apt/lists/*
+
+CMD ["R"]
diff --git a/4.1/resolute/version.txt b/4.1/resolute/version.txt
@@ -0,0 +1 @@
+4.1.3
diff --git a/4.2/resolute/Dockerfile b/4.2/resolute/Dockerfile
@@ -0,0 +1,23 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+ARG BASE_IMAGE=posit/r-base
+FROM ${BASE_IMAGE}:resolute
+
+ARG R_VERSION=4.2.3
+ARG OS_IDENTIFIER=ubuntu-2604
+
+# Install R
+RUN wget "https://cdn.posit.co/r/${OS_IDENTIFIER}/pkgs/r-${R_VERSION}_1_$(dpkg --print-architecture).deb" && \
+    apt-get update -qq && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -f -y "./r-${R_VERSION}_1_$(dpkg --print-architecture).deb" && \
+    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_$(dpkg --print-architecture).deb" && \
+    rm -rf /var/lib/apt/lists/*
+
+CMD ["R"]
diff --git a/4.2/resolute/version.txt b/4.2/resolute/version.txt
@@ -0,0 +1 @@
+4.2.3
diff --git a/4.3/resolute/Dockerfile b/4.3/resolute/Dockerfile
@@ -0,0 +1,23 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+ARG BASE_IMAGE=posit/r-base
+FROM ${BASE_IMAGE}:resolute
+
+ARG R_VERSION=4.3.3
+ARG OS_IDENTIFIER=ubuntu-2604
+
+# Install R
+RUN wget "https://cdn.posit.co/r/${OS_IDENTIFIER}/pkgs/r-${R_VERSION}_1_$(dpkg --print-architecture).deb" && \
+    apt-get update -qq && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -f -y "./r-${R_VERSION}_1_$(dpkg --print-architecture).deb" && \
+    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_$(dpkg --print-architecture).deb" && \
+    rm -rf /var/lib/apt/lists/*
+
+CMD ["R"]
diff --git a/4.3/resolute/version.txt b/4.3/resolute/version.txt
@@ -0,0 +1 @@
+4.3.3
diff --git a/4.4/resolute/Dockerfile b/4.4/resolute/Dockerfile
@@ -0,0 +1,23 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+ARG BASE_IMAGE=posit/r-base
+FROM ${BASE_IMAGE}:resolute
+
+ARG R_VERSION=4.4.3
+ARG OS_IDENTIFIER=ubuntu-2604
+
+# Install R
+RUN wget "https://cdn.posit.co/r/${OS_IDENTIFIER}/pkgs/r-${R_VERSION}_1_$(dpkg --print-architecture).deb" && \
+    apt-get update -qq && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -f -y "./r-${R_VERSION}_1_$(dpkg --print-architecture).deb" && \
+    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_$(dpkg --print-architecture).deb" && \
+    rm -rf /var/lib/apt/lists/*
+
+CMD ["R"]
diff --git a/4.4/resolute/version.txt b/4.4/resolute/version.txt
@@ -0,0 +1 @@
+4.4.3
diff --git a/4.5/resolute/Dockerfile b/4.5/resolute/Dockerfile
@@ -0,0 +1,23 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+ARG BASE_IMAGE=posit/r-base
+FROM ${BASE_IMAGE}:resolute
+
+ARG R_VERSION=4.5.3
+ARG OS_IDENTIFIER=ubuntu-2604
+
+# Install R
+RUN wget "https://cdn.posit.co/r/${OS_IDENTIFIER}/pkgs/r-${R_VERSION}_1_$(dpkg --print-architecture).deb" && \
+    apt-get update -qq && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -f -y "./r-${R_VERSION}_1_$(dpkg --print-architecture).deb" && \
+    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_$(dpkg --print-architecture).deb" && \
+    rm -rf /var/lib/apt/lists/*
+
+CMD ["R"]
diff --git a/4.5/resolute/version.txt b/4.5/resolute/version.txt
@@ -0,0 +1 @@
+4.5.3
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 BASE_IMAGE ?= posit/r-base
 VERSIONS ?= 4.0 4.1 4.2 4.3 4.4 4.5 devel next
-VARIANTS ?= focal jammy noble bookworm trixie centos7 rockylinux8 rockylinux9 rockylinux10 opensuse156
+VARIANTS ?= focal jammy noble resolute bookworm trixie centos7 rockylinux8 rockylinux9 rockylinux10 opensuse156
 
 # PATCH_VERSIONS defines all actively maintained R patch versions.
 PATCH_VERSIONS ?= 4.0.0 4.0.1 4.0.2 4.0.3 4.0.4 4.0.5 \
diff --git a/README.md b/README.md
@@ -50,6 +50,7 @@ The following distributions are supported for both `x86_64`/`amd64` and `aarch64
 | focal         | Ubuntu 20.04 |
 | jammy         | Ubuntu 22.04 |
 | noble         | Ubuntu 24.04 |
+| resolute      | Ubuntu 26.04 |
 | bookworm      | Debian 12 |
 | trixie        | Debian 13 |
 | centos7       | CentOS 7* |
diff --git a/base/resolute/Dockerfile b/base/resolute/Dockerfile
@@ -0,0 +1,45 @@
+FROM ubuntu:resolute
+
+LABEL maintainer="Posit Docker <docker@posit.co>"
+
+RUN apt-get update -qq && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y \
+    apt-transport-https \
+    curl \
+    fontconfig \
+    libcurl4-openssl-dev \
+    locales \
+    perl \
+    sudo \
+    tzdata \
+    wget \
+    # xz-utils is required to extract TinyTeX .tar.xz binaries
+    xz-utils && \
+    rm -rf /var/lib/apt/lists/*
+
+# Install TinyTeX
+# Set TMPDIR to / to avoid issues with the default /tmp directory on Ubuntu/Debian.
+# The TinyTeX installer downloads a tarball with files owned by 1001:1001. When extracted
+# as the root user, these files keep the original ownership with default tar options
+# (--no-same-owner to disable that behavior). Ubuntu/Debian have fs.protected_regular
+# enabled by default, disallowing root from writing files owned by other users in /tmp,
+# which the TinyTeX installer needs to do. Setting TMPDIR to / works around this issue.
+RUN wget -qO- "https://yihui.org/tinytex/install-bin-unix.sh" | TMPDIR=/ 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=3.9.0.2
+RUN wget "https://github.com/jgm/pandoc/releases/download/${PANDOC_VERSION}/pandoc-${PANDOC_VERSION}-linux-$(dpkg --print-architecture).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=C.UTF-8
+
+# Set default timezone
+ENV TZ=UTC
diff --git a/devel/resolute/Dockerfile b/devel/resolute/Dockerfile
@@ -0,0 +1,23 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+ARG BASE_IMAGE=posit/r-base
+FROM ${BASE_IMAGE}:resolute
+
+ARG R_VERSION=devel
+ARG OS_IDENTIFIER=ubuntu-2604
+
+# Install R
+RUN wget "https://cdn.posit.co/r/${OS_IDENTIFIER}/pkgs/r-${R_VERSION}_1_$(dpkg --print-architecture).deb" && \
+    apt-get update -qq && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -f -y "./r-${R_VERSION}_1_$(dpkg --print-architecture).deb" && \
+    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_$(dpkg --print-architecture).deb" && \
+    rm -rf /var/lib/apt/lists/*
+
+CMD ["R"]
diff --git a/devel/resolute/version.txt b/devel/resolute/version.txt
@@ -0,0 +1 @@
+devel
diff --git a/next/resolute/Dockerfile b/next/resolute/Dockerfile
@@ -0,0 +1,23 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+ARG BASE_IMAGE=posit/r-base
+FROM ${BASE_IMAGE}:resolute
+
+ARG R_VERSION=next
+ARG OS_IDENTIFIER=ubuntu-2604
+
+# Install R
+RUN wget "https://cdn.posit.co/r/${OS_IDENTIFIER}/pkgs/r-${R_VERSION}_1_$(dpkg --print-architecture).deb" && \
+    apt-get update -qq && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -f -y "./r-${R_VERSION}_1_$(dpkg --print-architecture).deb" && \
+    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_$(dpkg --print-architecture).deb" && \
+    rm -rf /var/lib/apt/lists/*
+
+CMD ["R"]
diff --git a/next/resolute/version.txt b/next/resolute/version.txt
@@ -0,0 +1 @@
+next
diff --git a/update.sh b/update.sh
@@ -16,6 +16,7 @@ declare -A os_identifiers=(
     [focal]='ubuntu-2004'
     [jammy]='ubuntu-2204'
     [noble]='ubuntu-2404'
+    [resolute]='ubuntu-2604'
     [bookworm]='debian-12'
     [trixie]='debian-13'
     [centos7]='centos-7'
@@ -49,7 +50,7 @@ for version in "${!r_versions[@]}"; do
         mkdir -p $dir
 
         case "$variant" in
-            focal|jammy|noble) template='ubuntu'
+            focal|jammy|noble|resolute) template='ubuntu'
             ;;
             bookworm|trixie) template='debian'
             ;;
