From 201651087f95b5e69950267dac0b5bf7b7bda832 Mon Sep 17 00:00:00 2001 From: Ruifeng Zheng Date: Mon, 10 Jul 2023 14:26:52 +0800 Subject: [PATCH 1/2] nit --- dev/infra/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dev/infra/Dockerfile b/dev/infra/Dockerfile index af8e1a980f93..b117ac0eed09 100644 --- a/dev/infra/Dockerfile +++ b/dev/infra/Dockerfile @@ -55,10 +55,9 @@ RUN $APT_INSTALL r-base libcurl4-openssl-dev qpdf libssl-dev zlib1g-dev RUN Rscript -e "install.packages(c('knitr', 'markdown', 'rmarkdown', 'testthat', 'devtools', 'e1071', 'survival', 'arrow', 'roxygen2', 'xml2'), repos='https://cloud.r-project.org/')" # See more in SPARK-39959, roxygen2 < 7.2.1 -RUN apt-get install -y libcurl4-openssl-dev libgit2-dev libssl-dev libxml2-dev \ +RUN apt-get install -y libgit2-dev libssl-dev libxml2-dev \ libfontconfig1-dev libharfbuzz-dev libfribidi-dev libfreetype6-dev libpng-dev \ libtiff5-dev libjpeg-dev -RUN Rscript -e "install.packages(c('devtools'), repos='https://cloud.r-project.org/')" RUN Rscript -e "devtools::install_version('roxygen2', version='7.2.0', repos='https://cloud.r-project.org')" # See more in SPARK-39735 From 87adbc8fe9c224bde6ae029f2e56fb25e10c5f8f Mon Sep 17 00:00:00 2001 From: Ruifeng Zheng Date: Mon, 10 Jul 2023 17:45:16 +0800 Subject: [PATCH 2/2] update --- dev/infra/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/dev/infra/Dockerfile b/dev/infra/Dockerfile index b117ac0eed09..bbf04793497a 100644 --- a/dev/infra/Dockerfile +++ b/dev/infra/Dockerfile @@ -55,6 +55,7 @@ RUN $APT_INSTALL r-base libcurl4-openssl-dev qpdf libssl-dev zlib1g-dev RUN Rscript -e "install.packages(c('knitr', 'markdown', 'rmarkdown', 'testthat', 'devtools', 'e1071', 'survival', 'arrow', 'roxygen2', 'xml2'), repos='https://cloud.r-project.org/')" # See more in SPARK-39959, roxygen2 < 7.2.1 +RUN apt-get update RUN apt-get install -y libgit2-dev libssl-dev libxml2-dev \ libfontconfig1-dev libharfbuzz-dev libfribidi-dev libfreetype6-dev libpng-dev \ libtiff5-dev libjpeg-dev