Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
6f6e1defd3 |
|||
|
db8dd66a07 |
3 changed files with 4 additions and 6 deletions
|
|
@ -4,6 +4,8 @@ ENV OS_IDENTIFIER ubuntu-2204
|
||||||
|
|
||||||
RUN set -x \
|
RUN set -x \
|
||||||
&& sed -i "s|# deb-src|deb-src|g" /etc/apt/sources.list \
|
&& 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 \
|
&& export DEBIAN_FRONTEND=noninteractive \
|
||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& apt-get install -y curl libcurl4-openssl-dev libicu-dev libopenblas-base libpcre2-dev wget python3-pip \
|
&& apt-get install -y curl libcurl4-openssl-dev libicu-dev libopenblas-base libpcre2-dev wget python3-pip \
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ RUN set -x \
|
||||||
&& sed -i "s|Types: deb|Types: deb deb-src|g" /etc/apt/sources.list.d/ubuntu.sources \
|
&& sed -i "s|Types: deb|Types: deb deb-src|g" /etc/apt/sources.list.d/ubuntu.sources \
|
||||||
&& export DEBIAN_FRONTEND=noninteractive \
|
&& export DEBIAN_FRONTEND=noninteractive \
|
||||||
&& apt update \
|
&& 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
|
&& apt build-dep -y r-base
|
||||||
|
|
||||||
# Install s5cmd for S3 uploads (much faster than AWS CLI)
|
# Install s5cmd for S3 uploads (much faster than AWS CLI)
|
||||||
|
|
|
||||||
|
|
@ -4,12 +4,8 @@ if [[ ! -d /tmp/output/${OS_IDENTIFIER} ]]; then
|
||||||
mkdir -p "/tmp/output/${OS_IDENTIFIER}"
|
mkdir -p "/tmp/output/${OS_IDENTIFIER}"
|
||||||
fi
|
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'
|
pcre_libs='- libpcre2-dev'
|
||||||
if [[ "${R_VERSION}" =~ ^3 ]]; then
|
|
||||||
pcre_libs='- libpcre2-dev
|
|
||||||
- libpcre3-dev'
|
|
||||||
fi
|
|
||||||
|
|
||||||
deflate_libs='# - libdeflate-dev'
|
deflate_libs='# - libdeflate-dev'
|
||||||
if grep -q '^LIBS *=.*[-]ldeflate' ${R_INSTALL_PATH}/lib/R/etc/Makeconf; then
|
if grep -q '^LIBS *=.*[-]ldeflate' ${R_INSTALL_PATH}/lib/R/etc/Makeconf; then
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue