From db8dd66a075d3e0457aed3283388c2856b6a9e81 Mon Sep 17 00:00:00 2001 From: pat-s Date: Fri, 24 Apr 2026 13:38:48 +0200 Subject: [PATCH 1/2] fix: remove libpcre3-dev from Ubuntu 26.04 build, not available in this release --- builder/Dockerfile.ubuntu-2604 | 2 +- builder/package.ubuntu-2604 | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/builder/Dockerfile.ubuntu-2604 b/builder/Dockerfile.ubuntu-2604 index d290325..3a7e5c2 100644 --- a/builder/Dockerfile.ubuntu-2604 +++ b/builder/Dockerfile.ubuntu-2604 @@ -6,7 +6,7 @@ RUN set -x \ && sed -i "s|Types: deb|Types: deb deb-src|g" /etc/apt/sources.list.d/ubuntu.sources \ && export DEBIAN_FRONTEND=noninteractive \ && apt update \ - && apt install -y curl libcurl4-openssl-dev libicu-dev libopenblas0-pthread libpcre2-dev libpcre3-dev unzip wget \ + && apt install -y curl libcurl4-openssl-dev libicu-dev libopenblas0-pthread libpcre2-dev unzip wget \ && apt build-dep -y r-base # Install s5cmd for S3 uploads (much faster than AWS CLI) diff --git a/builder/package.ubuntu-2604 b/builder/package.ubuntu-2604 index bae464d..8d78504 100644 --- a/builder/package.ubuntu-2604 +++ b/builder/package.ubuntu-2604 @@ -4,12 +4,8 @@ if [[ ! -d /tmp/output/${OS_IDENTIFIER} ]]; then mkdir -p "/tmp/output/${OS_IDENTIFIER}" fi -# R 3.x requires PCRE1. On Ubuntu 26, R 3.x also requires PCRE2 for Pango support. +# PCRE1 (libpcre3-dev) is not available on Ubuntu 26.04, use PCRE2 only. pcre_libs='- libpcre2-dev' -if [[ "${R_VERSION}" =~ ^3 ]]; then - pcre_libs='- libpcre2-dev -- libpcre3-dev' -fi deflate_libs='# - libdeflate-dev' if grep -q '^LIBS *=.*[-]ldeflate' ${R_INSTALL_PATH}/lib/R/etc/Makeconf; then From 6f6e1defd38ee04fbb14de114166df915cdb36f1 Mon Sep 17 00:00:00 2001 From: pat-s Date: Fri, 24 Apr 2026 13:40:13 +0200 Subject: [PATCH 2/2] fix: switch Ubuntu 22.04 apt sources from HTTP to HTTPS to avoid connection failures --- builder/Dockerfile.ubuntu-2204 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/builder/Dockerfile.ubuntu-2204 b/builder/Dockerfile.ubuntu-2204 index 9f95dc6..48b37c2 100644 --- a/builder/Dockerfile.ubuntu-2204 +++ b/builder/Dockerfile.ubuntu-2204 @@ -4,6 +4,8 @@ ENV OS_IDENTIFIER ubuntu-2204 RUN set -x \ && sed -i "s|# deb-src|deb-src|g" /etc/apt/sources.list \ + && sed -i "s|http://archive.ubuntu.com|https://archive.ubuntu.com|g" /etc/apt/sources.list \ + && sed -i "s|http://security.ubuntu.com|https://security.ubuntu.com|g" /etc/apt/sources.list \ && export DEBIAN_FRONTEND=noninteractive \ && apt-get update \ && apt-get install -y curl libcurl4-openssl-dev libicu-dev libopenblas-base libpcre2-dev wget python3-pip \