Skip to content
Snippets Groups Projects
Verified Commit ddb63fb9 authored by Olivier Benz's avatar Olivier Benz
Browse files

Merge branch 'master' into freeze-version

parents 34feba03 8ece4c8b
No related branches found
No related tags found
No related merge requests found
FROM registry.gitlab.b-data.ch/rocker/verse:4.1.2
FROM registry.gitlab.b-data.ch/rocker/verse:4.1.3
ARG NCPUS=1
......
......@@ -13,7 +13,7 @@ LABEL org.opencontainers.image.licenses="GPL-2.0" \
ARG IMAGE=debian:bullseye
ARG DEBIAN_FRONTEND=noninteractive
ARG LAPACK=libopenblas-dev
ARG BLAS=libopenblas-dev
ARG R_VERSION=4.1.1
ARG BUILD_DATE
ARG CRAN=https://cran.rstudio.com
......@@ -45,7 +45,7 @@ RUN apt-get update \
libicu-dev \
'^libjpeg.*-turbo.*-dev$' \
liblzma-dev \
${LAPACK} \
${BLAS} \
libpangocairo-1.0.0 \
libpaper-utils \
'^libpcre[2|3]-dev$' \
......
......@@ -13,7 +13,7 @@ LABEL org.opencontainers.image.licenses="GPL-2.0" \
ARG IMAGE=debian:bullseye
ARG DEBIAN_FRONTEND=noninteractive
ARG LAPACK=libopenblas-dev
ARG BLAS=libopenblas-dev
ARG R_VERSION=4.1.2
ARG BUILD_DATE
ARG CRAN=https://cran.rstudio.com
......@@ -45,7 +45,7 @@ RUN apt-get update \
libicu-dev \
'^libjpeg.*-turbo.*-dev$' \
liblzma-dev \
${LAPACK} \
${BLAS} \
libpangocairo-1.0.0 \
libpaper-utils \
'^libpcre[2|3]-dev$' \
......
ARG IMAGE=debian:bullseye
ARG R_VERSION=4.1.2
ARG R_VERSION=4.1.3
FROM registry.gitlab.b-data.ch/r/rsi/${R_VERSION}/${IMAGE} as rsi
......@@ -13,8 +13,8 @@ LABEL org.opencontainers.image.licenses="GPL-2.0" \
ARG IMAGE=debian:bullseye
ARG DEBIAN_FRONTEND=noninteractive
ARG LAPACK=libopenblas-dev
ARG R_VERSION=4.1.2
ARG BLAS=libopenblas-dev
ARG R_VERSION=4.1.3
ARG BUILD_DATE
ARG CRAN=https://cran.rstudio.com
## Setting a BUILD_DATE will set CRAN to the matching MRAN date
......@@ -39,13 +39,13 @@ RUN apt-get update \
g++ \
gfortran \
gsfonts \
libblas-dev \
libbz2-dev \
'^libcurl[3|4]$' \
libicu-dev \
'^libjpeg.*-turbo.*-dev$' \
liblapack-dev \
liblzma-dev \
${LAPACK} \
${BLAS} \
libpangocairo-1.0.0 \
libpaper-utils \
'^libpcre[2|3]-dev$' \
......@@ -57,6 +57,13 @@ RUN apt-get update \
unzip \
zip \
zlib1g \
## Switch BLAS/LAPACK (manual mode)
&& if [ ${BLAS} = "libopenblas-dev" ]; then \
update-alternatives --set libblas.so.3-$(uname -m)-linux-gnu \
/usr/lib/$(uname -m)-linux-gnu/openblas-pthread/libblas.so.3; \
update-alternatives --set liblapack.so.3-$(uname -m)-linux-gnu \
/usr/lib/$(uname -m)-linux-gnu/openblas-pthread/liblapack.so.3; \
fi \
## Update locale
&& sed -i "s/# $LANG/$LANG/g" /etc/locale.gen \
&& locale-gen \
......
......@@ -3,12 +3,12 @@ ARG GIT_VERSION=2.35.1
FROM registry.gitlab.b-data.ch/git/gsi/${GIT_VERSION}/${IMAGE} as gsi
FROM registry.gitlab.b-data.ch/r/r-ver:4.1.2
FROM registry.gitlab.b-data.ch/r/r-ver:4.1.3
ARG DEBIAN_FRONTEND=noninteractive
ARG GIT_VERSION=2.35.1
ARG RSTUDIO_VERSION=2022.02.0+443
ARG RSTUDIO_VERSION=2022.02.1+461
ARG S6_VERSION=v2.2.0.3
ENV GIT_VERSION=${GIT_VERSION} \
......@@ -58,6 +58,8 @@ RUN apt-get update \
BUNDLED_PANDOC="/usr/lib/rstudio-server/bin/pandoc/pandoc"; \
elif [ -f "/usr/lib/rstudio-server/bin/quarto/bin/pandoc" ]; then \
BUNDLED_PANDOC="/usr/lib/rstudio-server/bin/quarto/bin/pandoc"; \
elif [ -f "/usr/lib/rstudio-server/bin/quarto/bin/tools/pandoc" ]; then \
BUNDLED_PANDOC="/usr/lib/rstudio-server/bin/quarto/bin/tools/pandoc"; \
fi \
&& ln -s "$BUNDLED_PANDOC" /usr/local/bin \
&& if [ -f "${BUNDLED_PANDOC}-citeproc" ]; then \
......
FROM registry.gitlab.b-data.ch/rocker/rstudio:4.1.2
FROM registry.gitlab.b-data.ch/rocker/rstudio:4.1.3
ARG NCPUS=1
......
FROM registry.gitlab.b-data.ch/rocker/tidyverse:4.1.2
FROM registry.gitlab.b-data.ch/rocker/tidyverse:4.1.3
ARG NCPUS=1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment