Skip to content

Commit

Permalink
ARROW-4343: [C++] Add docker-compose test for gcc 4.8 / Ubuntu 14.04 …
Browse files Browse the repository at this point in the history
…(Trusty), expand Xenial/16.04 Dockerfile to test Flight

This also fixes a build failure ARROW-5617 resulting from thrift_ep needing to be pointed to the output of boost_ep when ARROW_BOOST_VENDORED=ON

Author: Wes McKinney <wesm+git@apache.org>

Closes #4582 from wesm/ARROW-4343 and squashes the following commits:

bb358aec8 <Wes McKinney> Do not add OpenSSL libraries redundantly when linking arrow_flight
1bdca89a4 <Wes McKinney> Require OpenSSL in Docker builds, use AUTO method for uriparser
3d269a57f <Wes McKinney> Link to OpenSSL::SSL also. Fix incorrect comment about OpenSSL imported targets that were released in CMake 3.4.0
75f44d717 <Wes McKinney> Ubuntu 14.04 build working also
a505105e7 <Wes McKinney> Fix Xenial linking to OpenSSL, set test data paths
efcda4a62 <Wes McKinney> Fix boost_ep
e981cf3fb <Wes McKinney> Ubuntu Xenial fixes
761b8e20d <Wes McKinney> Add dependency on boost_ep in thrift_ep if ARROW_BOOST_VENDORED=ON
f1a615053 <Wes McKinney> fix lz4 package name
d71bfe1e8 <Wes McKinney> Draft initial Ubuntu Trusty 14.04 Dockerfile
  • Loading branch information
wesm committed Jun 17, 2019
1 parent e8691a0 commit ed20cee
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 0 deletions.
4 changes: 4 additions & 0 deletions ci/docker_build_and_test_cpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,9 @@ set -e

/arrow/ci/docker_build_cpp.sh
pushd /build/cpp

export ARROW_TEST_DATA=/arrow/testing/data
export PARQUET_TEST_DATA=/arrow/cpp/submodules/parquet-testing/data

ninja unittest
popd
3 changes: 3 additions & 0 deletions ci/docker_build_cpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ cmake -GNinja \
-DARROW_WITH_BZ2=${ARROW_WITH_BZ2:-ON} \
-DARROW_WITH_ZSTD=${ARROW_WITH_ZSTD:-ON} \
-DARROW_BUILD_BENCHMARKS=${ARROW_BUILD_BENCHMARKS:-ON} \
-DARROW_BOOST_VENDORED=${ARROW_BOOST_VENDORED:-OFF} \
-DARROW_FLIGHT=${ARROW_FLIGHT:-ON} \
-DARROW_ORC=${ARROW_ORC:-ON} \
-DARROW_PLASMA=${ARROW_PLASMA:-ON} \
Expand All @@ -52,7 +53,9 @@ cmake -GNinja \
-DARROW_BUILD_SHARED=${ARROW_BUILD_SHARED:-ON} \
-DARROW_BUILD_STATIC=${ARROW_BUILD_STATIC:-ON} \
-DARROW_TEST_LINKAGE=${ARROW_TEST_LINKAGE:-shared} \
-DPARQUET_REQUIRE_ENCRYPTION=${ARROW_WITH_OPENSSL:-ON} \
-DCMAKE_CXX_FLAGS=$CXXFLAGS \
-Duriparser_SOURCE=AUTO \
${CMAKE_ARGS} \
${source_dir}
ninja
Expand Down
19 changes: 19 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ x-ubuntu-volumes:
- .:/arrow:delegated
- ubuntu-cache:/build:delegated

x-ubuntu-trusty-volumes:
&ubuntu-trusty-volumes
- .:/arrow:delegated
- ubuntu-trusty-cache:/build:delegated

x-ubuntu-xenial-volumes:
&ubuntu-xenial-volumes
- .:/arrow:delegated
Expand Down Expand Up @@ -59,6 +64,7 @@ x-debian-testing-volumes:

volumes:
ubuntu-cache:
ubuntu-trusty-cache:
ubuntu-xenial-cache:
ubuntu-bionic-cache:
alpine-cache:
Expand Down Expand Up @@ -190,6 +196,19 @@ services:
PARQUET_TEST_DATA: /arrow/cpp/submodules/parquet-testing/data
volumes: *debian-testing-volumes

cpp-ubuntu-trusty:
# Usage:
# docker-compose build cpp-ubuntu-trusty
# docker-compose run cpp-ubuntu-trusty
image: arrow:cpp-ubuntu-trusty
shm_size: 2G
build:
context: .
dockerfile: cpp/Dockerfile.ubuntu-trusty
environment:
PARQUET_TEST_DATA: /arrow/cpp/submodules/parquet-testing/data
volumes: *ubuntu-trusty-volumes

cpp-ubuntu-xenial:
# Usage:
# docker-compose build cpp-ubuntu-xenial
Expand Down

0 comments on commit ed20cee

Please sign in to comment.