[
https://issues.apache.org/jira/browse/ARROW-1765?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16239007#comment-16239007
]
ASF GitHub Bot commented on ARROW-1765:
---------------------------------------
xhochy closed pull request #1278: ARROW-1765: [Doc] Use dependencies from conda
in C++ docker build
URL: https://github.com/apache/arrow/pull/1278
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/dev/gen_apidocs/Dockerfile b/dev/gen_apidocs/Dockerfile
index 0b2844cc8..eaeb54818 100644
--- a/dev/gen_apidocs/Dockerfile
+++ b/dev/gen_apidocs/Dockerfile
@@ -15,8 +15,6 @@
# limitations under the License.
#
FROM ubuntu:14.04
-ADD . /apache-arrow
-WORKDIR /apache-arrow
# Prerequsites for apt-add-repository
RUN apt-get update && apt-get install -y \
software-properties-common python-software-properties
@@ -34,14 +32,6 @@ RUN wget -O /tmp/miniconda.sh \
https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh && \
bash /tmp/miniconda.sh -b -p /home/ubuntu/miniconda && \
rm /tmp/miniconda.sh
-# C++ dependencies
-RUN /home/ubuntu/miniconda/bin/conda install -c conda-forge \
- boost-cpp \
- doxygen \
- maven \
- cmake \
- zlib \
- thrift-cpp
# C_Glib dependencies
RUN apt-get install -y \
libgtk2.0-dev \
@@ -69,6 +59,7 @@ RUN /home/ubuntu/miniconda/bin/conda create -y -q -n
pyarrow-dev \
six \
setuptools \
# C++
+ boost-cpp \
cmake \
flatbuffers \
rapidjson \
@@ -79,5 +70,9 @@ RUN /home/ubuntu/miniconda/bin/conda create -y -q -n
pyarrow-dev \
jemalloc \
lz4-c \
zstd \
+ doxygen \
+ maven \
-c conda-forge
+ADD . /apache-arrow
+WORKDIR /apache-arrow
CMD arrow/dev/gen_apidocs/create_documents.sh
diff --git a/dev/gen_apidocs/create_documents.sh
b/dev/gen_apidocs/create_documents.sh
index afbe04150..762b85222 100755
--- a/dev/gen_apidocs/create_documents.sh
+++ b/dev/gen_apidocs/create_documents.sh
@@ -16,6 +16,8 @@
# limitations under the License.
#
+set -ex
+
# Set up environment and output directory for C++ libraries
cd /apache-arrow
rm -rf dist
@@ -25,8 +27,6 @@ export ARROW_HOME=$(pwd)/dist
export PARQUET_HOME=$(pwd)/dist
CONDA_BASE=/home/ubuntu/miniconda
export LD_LIBRARY_PATH=$(pwd)/dist/lib:${CONDA_BASE}/lib:${LD_LIBRARY_PATH}
-export THRIFT_HOME=${CONDA_BASE}
-export BOOST_ROOT=${CONDA_BASE}
export PATH=${CONDA_BASE}/bin:${PATH}
# Prepare the asf-site before copying api docs
@@ -41,6 +41,10 @@ popd
# Make Python documentation (Depends on C++ )
# Build Arrow C++
source activate pyarrow-dev
+
+export ARROW_BUILD_TOOLCHAIN=$CONDA_PREFIX
+export PARQUET_BUILD_TOOLCHAIN=$CONDA_PREFIX
+
rm -rf arrow/cpp/build
mkdir arrow/cpp/build
pushd arrow/cpp/build
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> [Doc] Use dependencies from conda in C++ docker build
> -----------------------------------------------------
>
> Key: ARROW-1765
> URL: https://issues.apache.org/jira/browse/ARROW-1765
> Project: Apache Arrow
> Issue Type: Improvement
> Components: Documentation
> Reporter: Uwe L. Korn
> Assignee: Uwe L. Korn
> Labels: pull-request-available
> Fix For: 0.8.0
>
>
> Currently dependencies are built from scratch mostly in the C++ build for the
> documentation instead of using the conda-installed ones. Setting
> {{ARROW_BUILD_TOOLCHAIN=$CONDA_PREFIX}} should improve build times.
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
