[arrow] branch master updated: ARROW-4134: [Packaging] Properly setup timezone in docker tests to prevent ORC adapter's abort

[we...@apache.org]

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

wesm 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 8c26b77  ARROW-4134: [Packaging] Properly setup timezone in docker tests to prevent ORC adapter's abort
8c26b77 is described below

commit 8c26b77120e592b10453aca1ab419c30e378dd7b
Author: Krisztián Szűcs <sz...@gmail.com>
AuthorDate: Mon Dec 31 10:52:08 2018 -0600

    ARROW-4134: [Packaging] Properly setup timezone in docker tests to prevent ORC adapter's abort
    
    Python ORC tests were failing because of unset timezone.
    
    Crossbow tests: [kszucs/crossbow/build-388](https://github.com/kszucs/crossbow/branches/all?utf8=%E2%9C%93&query=build-388)
    
    Author: Krisztián Szűcs <sz...@gmail.com>
    
    Closes #3288 from kszucs/ARROW-4134 and squashes the following commits:
    
    4f502625 <Krisztián Szűcs> setup timezone in tha base cpp image
---
 c_glib/Dockerfile | 2 --
 cpp/Dockerfile    | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/c_glib/Dockerfile b/c_glib/Dockerfile
index 5d64a5f..7c8e412 100644
--- a/c_glib/Dockerfile
+++ b/c_glib/Dockerfile
@@ -17,9 +17,7 @@
 
 FROM arrow:cpp
 
-ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get -q install --no-install-recommends -y \
-        tzdata \
         ruby-dev \
         pkg-config \
         autoconf-archive \
diff --git a/cpp/Dockerfile b/cpp/Dockerfile
index 84c00b9..4e5a4e4 100644
--- a/cpp/Dockerfile
+++ b/cpp/Dockerfile
@@ -18,7 +18,8 @@
 FROM ubuntu:18.04
 
 # install build essentials
-RUN apt-get update -y -q && \
+RUN export DEBIAN_FRONTEND=noninteractive && \
+    apt-get update -y -q && \
     apt-get install -y -q --no-install-recommends \
         ca-certificates \
         ccache \
@@ -27,6 +28,7 @@ RUN apt-get update -y -q && \
         git \
         ninja-build \
         pkg-config \
+        tzdata \
         wget
 
 # install conda and required packages