Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ci/docker_build_and_test_cpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,11 @@ pushd /build/cpp
export ARROW_TEST_DATA=/arrow/testing/data
export PARQUET_TEST_DATA=/arrow/cpp/submodules/parquet-testing/data

# ARROW-5653 after install target, RPATH is modified on linux. Add this such
# that libraries are found with conda.
if [[ ! -z "${CONDA_PREFIX}" ]]; then
export LD_LIBRARY_PATH=${CONDA_PREFIX}/lib
fi

ninja unittest
popd
68 changes: 68 additions & 0 deletions cpp/Dockerfile.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

FROM ubuntu:18.04

# install build essentials
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update -y -q && \
apt-get install -y -q --no-install-recommends \
ca-certificates \
curl \
ccache \
g++ \
gcc \
git \
libidn11 \
ninja-build \
pkg-config \
tzdata \
wget \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

# install conda and required packages
ARG EXTRA_CONDA_PKGS
ENV PATH=/opt/conda/bin:$PATH \
CONDA_PREFIX=/opt/conda
COPY ci/docker_install_conda.sh \
ci/conda_env_cpp.yml \
ci/conda_env_unix.yml \
/arrow/ci/
RUN arrow/ci/docker_install_conda.sh && \
conda install -q -c conda-forge \
--file arrow/ci/conda_env_cpp.yml \
--file arrow/ci/conda_env_unix.yml \
$EXTRA_CONDA_PKGS && \
conda clean --all

ARG CMAKE_VERSION=3.2.3
ARG CMAKE_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
RUN curl ${CMAKE_URL} -Lo cmake-${CMAKE_VERSION}.tar.gz && \
mkdir /opt/cmake && tar -zxvf cmake-${CMAKE_VERSION}.tar.gz -C /opt/cmake
ENV PATH=/opt/cmake/cmake-${CMAKE_VERSION}-Linux-x86_64/bin:$PATH

ENV CC=gcc \
CXX=g++ \
ARROW_GANDIVA=OFF \
ARROW_BUILD_TESTS=ON \
ARROW_DEPENDENCY_SOURCE=CONDA \
ARROW_HOME=$CONDA_PREFIX \
PARQUET_HOME=$CONDA_PREFIX

# build and test
CMD ["arrow/ci/docker_build_and_test_cpp.sh"]
1 change: 1 addition & 0 deletions cpp/Dockerfile.ubuntu-trusty
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ ENV CC=gcc \
ARROW_BUILD_TESTS=ON \
ARROW_DEPENDENCY_SOURCE=SYSTEM \
ARROW_FLIGHT=OFF \
ARROW_WITH_OPENSSL=OFF \
ARROW_GANDIVA=OFF \
ARROW_GANDIVA_JAVA=OFF \
ARROW_ORC=OFF \
Expand Down
2 changes: 1 addition & 1 deletion dev/tasks/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ tasks:
commands:
- docker-compose build cpp
- docker-compose build c_glib
- docker-compose run cpp
- docker-compose run c_glib

docker-go:
ci: circle
Expand Down
8 changes: 6 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,15 @@ services:
shm_size: 2G
build:
context: .
dockerfile: cpp/Dockerfile
dockerfile: cpp/Dockerfile.cmake
args:
EXTRA_CONDA_PKGS: cmake=3.2
CMAKE_VERSION: 3.2.3
environment:
# Vendor boost to avoid dealing with stale FindBoost.
ARROW_BOOST_SOURCE: "BUNDLED"
ARROW_ORC: "OFF"
# uriparser requires cmake 3.3
ARROW_FLIGHT: "OFF"
PARQUET_TEST_DATA: /arrow/cpp/submodules/parquet-testing/data
volumes: *ubuntu-volumes

Expand Down
18 changes: 11 additions & 7 deletions r/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ ENV CC=gcc \

# r-base includes tzdata. Get around interactive stop in that package
ENV DEBIAN_FRONTEND=noninteractive
# workaround for install_github GitHub API rate limit
ENV CI=true

# Build R
# [1] https://www.digitalocean.com/community/tutorials/how-to-install-r-on-ubuntu-18-04
Expand Down Expand Up @@ -50,7 +52,15 @@ RUN apt-get update -y && \
texlive-latex-base && \
apt-get clean && \
rm -rf /var/lib/apt/lists/* && \
Rscript -e "install.packages('devtools', repos = 'http://cran.rstudio.com')" && \

# So that arrowExports.* files are generated
ENV ARROW_R_DEV=TRUE

# Tell R where it can find the source code for arrow
ENV PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/build/cpp/src/arrow:/opt/conda/lib/pkgconfig
ENV LD_LIBRARY_PATH=/opt/conda/lib/:/build/cpp/src/arrow:/arrow/r/src

RUN Rscript -e "install.packages('devtools', repos = 'http://cran.rstudio.com')" && \
Rscript -e "devtools::install_github('romainfrancois/decor')" && \
Rscript -e "install.packages(c( \
'Rcpp', 'dplyr', 'stringr', 'glue', 'vctrs', \
Expand All @@ -65,12 +75,6 @@ RUN apt-get update -y && \
'lubridate'), \
repos = 'https://cran.rstudio.com')"

# So that arrowExports.* files are generated
ENV ARROW_R_DEV=TRUE

# Tell R where it can find the source code for arrow
ENV PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/build/cpp/src/arrow:/opt/conda/lib/pkgconfig
ENV LD_LIBRARY_PATH=/opt/conda/lib/:/build/cpp/src/arrow:/arrow/r/src

# build, install, test R package
CMD ["/bin/bash", "-c", "/arrow/ci/docker_build_cpp.sh && \
Expand Down
4 changes: 2 additions & 2 deletions r/tests/testthat/test-json.R
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ test_that("Can read json file with scalars columns (ARROW-5503)", {
{ "hello": 3.25, "world": null }
{ "hello": 3.125, "world": null, "yo": "\u5fcd" }
{ "hello": 0.0, "world": true, "yo": null }
', tf)
', tf, useBytes=TRUE)

tab1 <- read_json_arrow(tf, as_tibble = FALSE)
tab2 <- read_json_arrow(mmap_open(tf), as_tibble = FALSE)
Expand Down Expand Up @@ -52,7 +52,7 @@ test_that("read_json_arrow() converts to tibble", {
{ "hello": 3.25, "world": null }
{ "hello": 3.125, "world": null, "yo": "\u5fcd" }
{ "hello": 0.0, "world": true, "yo": null }
', tf)
', tf, useBytes=TRUE)

tab1 <- read_json_arrow(tf)
tab2 <- read_json_arrow(mmap_open(tf))
Expand Down
3 changes: 3 additions & 0 deletions rust/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,7 @@ ENV CARGO_TARGET_DIR=/build/rust
COPY rust/Cargo.toml /arrow/rust/Cargo.toml
WORKDIR /arrow/rust

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

CMD ["cargo", "test"]