[arrow] branch master updated: ARROW-1765: [Doc] Use dependencies from conda in C++ docker build

[uw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

uwe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new b9a2ce9  ARROW-1765: [Doc] Use dependencies from conda in C++ docker build
b9a2ce9 is described below

commit b9a2ce9b277c7938775d51b919b4a6464be7a66f
Author: Korn, Uwe <Uw...@blue-yonder.com>
AuthorDate: Sat Nov 4 14:24:12 2017 +0100

    ARROW-1765: [Doc] Use dependencies from conda in C++ docker build
    
    Author: Korn, Uwe <Uw...@blue-yonder.com>
    
    Closes #1278 from xhochy/ARROW-1765 and squashes the following commits:
    
    f29ffaf [Korn, Uwe] ARROW-1765: [Doc] Use dependencies from conda in C++ docker build
---
 dev/gen_apidocs/Dockerfile          | 15 +++++----------
 dev/gen_apidocs/create_documents.sh |  8 ++++++--
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/dev/gen_apidocs/Dockerfile b/dev/gen_apidocs/Dockerfile
index 0b2844c..eaeb548 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 afbe041..762b852 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

-- 
To stop receiving notification emails like this one, please contact
['"commits@arrow.apache.org" <co...@arrow.apache.org>'].