This is an automated email from the ASF dual-hosted git repository.
paleolimbot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-nanoarrow.git
The following commit(s) were added to refs/heads/main by this push:
new 06b30ac chore(ci): Add documentation build tools to the Ubuntu docker
image (#183)
06b30ac is described below
commit 06b30acdff9d98d74a414feb60a42c30a477edbb
Author: Dewey Dunnington <[email protected]>
AuthorDate: Thu Apr 20 13:27:46 2023 -0400
chore(ci): Add documentation build tools to the Ubuntu docker image (#183)
The Ubuntu image is unofficially the "maximal" image (it also contains
the arrow R package). Adding this in a separate PR from the actual build
script so that I can manually trigger the image push once this is merged
(and then it will be available for pulling by CI in the relevant PR).
---
ci/docker/alpine.dockerfile | 4 ++--
ci/docker/centos7.dockerfile | 4 ++--
ci/docker/ubuntu.dockerfile | 7 +++++--
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/ci/docker/alpine.dockerfile b/ci/docker/alpine.dockerfile
index 7c0eb9b..0e736eb 100644
--- a/ci/docker/alpine.dockerfile
+++ b/ci/docker/alpine.dockerfile
@@ -22,10 +22,10 @@ FROM --platform=linux/${NANOARROW_ARCH} alpine:latest
RUN apk add bash linux-headers git cmake R R-dev g++ gnupg curl
# For Arrow C++
-RUN curl
https://dlcdn.apache.org/arrow/arrow-11.0.0/apache-arrow-11.0.0.tar.gz | tar
-zxf - && \
+RUN curl -L
https://github.com/apache/arrow/archive/refs/tags/apache-arrow-11.0.0.tar.gz |
tar -zxf - && \
mkdir /arrow-build && \
cd /arrow-build && \
- cmake ../apache-arrow-11.0.0/cpp \
+ cmake ../arrow-apache-arrow-11.0.0/cpp \
-DARROW_JEMALLOC=OFF \
-DARROW_SIMD_LEVEL=NONE \
-DCMAKE_INSTALL_PREFIX=../arrow && \
diff --git a/ci/docker/centos7.dockerfile b/ci/docker/centos7.dockerfile
index cef84f3..0009dc6 100644
--- a/ci/docker/centos7.dockerfile
+++ b/ci/docker/centos7.dockerfile
@@ -26,10 +26,10 @@ RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8
ENV LC_ALL en_US.UTF-8
# For Arrow C++. Use 9.0.0 because this version works fine with the default gcc
-RUN curl https://dlcdn.apache.org/arrow/arrow-9.0.0/apache-arrow-9.0.0.tar.gz
| tar -zxf - && \
+RUN curl -L
https://github.com/apache/arrow/archive/refs/tags/apache-arrow-9.0.0.tar.gz |
tar -zxf - && \
mkdir /arrow-build && \
cd /arrow-build && \
- cmake3 ../apache-arrow-9.0.0/cpp \
+ cmake3 ../arrow-apache-arrow-9.0.0/cpp \
-DARROW_JEMALLOC=OFF \
-DARROW_SIMD_LEVEL=NONE \
-DCMAKE_INSTALL_PREFIX=../arrow && \
diff --git a/ci/docker/ubuntu.dockerfile b/ci/docker/ubuntu.dockerfile
index 7cd6d76..4db5ae6 100644
--- a/ci/docker/ubuntu.dockerfile
+++ b/ci/docker/ubuntu.dockerfile
@@ -19,7 +19,7 @@ ARG NANOARROW_ARCH
FROM --platform=linux/${NANOARROW_ARCH} ubuntu:latest
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y
locales git cmake r-base gnupg curl valgrind
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y
locales git cmake r-base gnupg curl valgrind python3-pip doxygen pandoc lcov
RUN locale-gen en_US.UTF-8 && update-locale en_US.UTF-8
# For Arrow C++
@@ -29,9 +29,12 @@ RUN apt-get install -y -V ca-certificates lsb-release wget
&& \
apt-get update && \
apt-get install -y -V libarrow-dev
+# For documentation build
+RUN pip3 install pydata-sphinx-theme sphinx breathe
+
# For R. Note that we install arrow here so that the integration tests for R
run
# in at least one test image.
-RUN R -e 'install.packages(c("blob", "hms", "tibble", "rlang", "testthat",
"tibble", "vctrs", "withr"), repos = "https://cloud.r-project.org";)'
+RUN R -e 'install.packages(c("blob", "hms", "tibble", "rlang", "testthat",
"tibble", "vctrs", "withr", "pkgdown", "covr"), repos =
"https://cloud.r-project.org";)'
# Required for this to work on MacOS/arm64
RUN mkdir ~/.R && echo "CXX17FLAGS += -fPIC" > ~/.R/Makevars
