You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@orc.apache.org by do...@apache.org on 2020/12/06 07:14:25 UTC

[orc] branch branch-1.6 updated: ORC-674: Update docker files (#553) (#578)

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

dongjoon pushed a commit to branch branch-1.6
in repository https://gitbox.apache.org/repos/asf/orc.git


The following commit(s) were added to refs/heads/branch-1.6 by this push:
     new aabfb5c  ORC-674: Update docker files (#553) (#578)
aabfb5c is described below

commit aabfb5c81911e15af5943a39e7d9008a4d8896a7
Author: Panagiotis Garefalakis <pg...@apache.org>
AuthorDate: Sun Dec 6 07:14:18 2020 +0000

    ORC-674: Update docker files (#553) (#578)
    
    - added docker files for ubuntu 20 with and without clang
    - remove debian 8, and ubuntu 14
    
    (cherry picked from commit 7275ceb8cce0a7316daa357e632fcf4bb21501c8)
---
 c++/src/wrap/orc-proto-wrapper.cc              |  1 +
 docker/README.md                               |  4 +-
 docker/centos7/Dockerfile                      |  2 +-
 docker/centos8/Dockerfile                      |  2 +-
 docker/debian10/Dockerfile                     |  2 +-
 docker/debian8/Dockerfile                      |  2 +-
 docker/debian9/Dockerfile                      |  2 +-
 docker/os-list.txt                             |  4 +-
 docker/ubuntu14/Dockerfile                     |  2 +-
 docker/ubuntu16-clang5/Dockerfile              | 53 --------------------------
 docker/ubuntu16/Dockerfile                     |  2 +-
 docker/ubuntu18/Dockerfile                     |  2 +-
 docker/{ubuntu20 => ubuntu20-clang}/Dockerfile |  9 +++--
 docker/ubuntu20/Dockerfile                     |  1 +
 site/_docs/building.md                         |  4 +-
 15 files changed, 22 insertions(+), 70 deletions(-)

diff --git a/c++/src/wrap/orc-proto-wrapper.cc b/c++/src/wrap/orc-proto-wrapper.cc
index dd00c9f..513b78a 100644
--- a/c++/src/wrap/orc-proto-wrapper.cc
+++ b/c++/src/wrap/orc-proto-wrapper.cc
@@ -15,6 +15,7 @@
 #include "Adaptor.hh"
 
 #if defined(__GNUC__) || defined(__clang__)
+  DIAGNOSTIC_IGNORE("-Warray-bounds")
   DIAGNOSTIC_IGNORE("-Wconversion")
   DIAGNOSTIC_IGNORE("-Wdeprecated")
   DIAGNOSTIC_IGNORE("-Wignored-qualifiers")
diff --git a/docker/README.md b/docker/README.md
index 2584c7e..3ba46fd 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,8 +1,8 @@
 ## Supported OSes
 
 * CentOS 7, and 8
-* Debian 8, 9, and 10
-* Ubuntu 14, 16, and 18
+* Debian 9, and 10
+* Ubuntu 16, 18, and 20
 
 ## Test
 
diff --git a/docker/centos7/Dockerfile b/docker/centos7/Dockerfile
index 66ab44d..ef2a1bd 100644
--- a/docker/centos7/Dockerfile
+++ b/docker/centos7/Dockerfile
@@ -18,7 +18,7 @@
 #
 
 FROM centos:7
-MAINTAINER Owen O'Malley <ow...@hortonworks.com>
+MAINTAINER Apache ORC project <de...@orc.apache.org>
 
 RUN yum check-update || true
 RUN yum -y install epel-release
diff --git a/docker/centos8/Dockerfile b/docker/centos8/Dockerfile
index 76c2012..7549d20 100644
--- a/docker/centos8/Dockerfile
+++ b/docker/centos8/Dockerfile
@@ -18,7 +18,7 @@
 #
 
 FROM centos:8
-MAINTAINER Owen O'Malley <ow...@hortonworks.com>
+MAINTAINER Apache ORC project <de...@orc.apache.org>
 
 RUN yum check-update || true
 RUN yum install -y \
diff --git a/docker/debian10/Dockerfile b/docker/debian10/Dockerfile
index cfd7e97..bdc796e 100644
--- a/docker/debian10/Dockerfile
+++ b/docker/debian10/Dockerfile
@@ -18,7 +18,7 @@
 #
 
 FROM debian:buster
-MAINTAINER Owen O'Malley <om...@apache.org>
+MAINTAINER Apache ORC project <de...@orc.apache.org>
 
 RUN apt-get update
 RUN apt-get install -y \
diff --git a/docker/debian8/Dockerfile b/docker/debian8/Dockerfile
index 2e933ba..34a4b95 100644
--- a/docker/debian8/Dockerfile
+++ b/docker/debian8/Dockerfile
@@ -18,7 +18,7 @@
 #
 
 FROM debian:8
-MAINTAINER Owen O'Malley <ow...@hortonworks.com>
+MAINTAINER Apache ORC project <de...@orc.apache.org>
 
 ADD sources.list apt.conf /etc/apt/
 
diff --git a/docker/debian9/Dockerfile b/docker/debian9/Dockerfile
index 7921a94..1d75141 100644
--- a/docker/debian9/Dockerfile
+++ b/docker/debian9/Dockerfile
@@ -18,7 +18,7 @@
 #
 
 FROM debian:9
-MAINTAINER Owen O'Malley <ow...@hortonworks.com>
+MAINTAINER Apache ORC project <de...@orc.apache.org>
 
 RUN apt-get update
 RUN apt-get install -y \
diff --git a/docker/os-list.txt b/docker/os-list.txt
index fa6eae2..98755e8 100644
--- a/docker/os-list.txt
+++ b/docker/os-list.txt
@@ -1,8 +1,8 @@
 centos7
 centos8
-debian8
 debian9
 debian10
-ubuntu14
 ubuntu16
 ubuntu18
+ubuntu20
+ubuntu20-clang
diff --git a/docker/ubuntu14/Dockerfile b/docker/ubuntu14/Dockerfile
index f9b3f0f..0b2bbec 100644
--- a/docker/ubuntu14/Dockerfile
+++ b/docker/ubuntu14/Dockerfile
@@ -18,7 +18,7 @@
 #
 
 FROM ubuntu:14.04
-MAINTAINER Owen O'Malley <ow...@hortonworks.com>
+MAINTAINER Apache ORC project <de...@orc.apache.org>
 
 RUN apt-get update
 RUN apt-get install -y software-properties-common
diff --git a/docker/ubuntu16-clang5/Dockerfile b/docker/ubuntu16-clang5/Dockerfile
deleted file mode 100644
index dc973f3..0000000
--- a/docker/ubuntu16-clang5/Dockerfile
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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.
-
-# ORC compile for Ubuntu 16 (clang 5)
-#
-
-FROM ubuntu:16.04
-MAINTAINER Owen O'Malley <ow...@hortonworks.com>
-
-RUN apt-get update
-RUN apt-get install -y wget software-properties-common
-RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
-RUN apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main"
-RUN apt-get update
-RUN apt-get install -y \
-  cmake \
-  default-jdk \
-  clang-5.0 \
-  git \
-  libsasl2-dev \
-  libssl-dev \
-  make \
-  maven \
-  tzdata
-
-ENV CC=clang-5.0
-ENV CXX=clang++-5.0
-
-WORKDIR /root
-VOLUME /root/.m2/repository
-
-CMD if [ ! -d orc ]; then \
-      echo "No volume provided, building from apache master."; \
-      echo "Pass '-v`pwd`:/root/orc' to docker run to build local source."; \
-      git clone https://github.com/apache/orc.git -b master; \
-    fi && \
-    mkdir build && \
-    cd build && \
-    cmake ../orc && \
-    make package test-out
diff --git a/docker/ubuntu16/Dockerfile b/docker/ubuntu16/Dockerfile
index cb6c166..c69a755 100644
--- a/docker/ubuntu16/Dockerfile
+++ b/docker/ubuntu16/Dockerfile
@@ -18,7 +18,7 @@
 #
 
 FROM ubuntu:16.04
-MAINTAINER Owen O'Malley <ow...@hortonworks.com>
+MAINTAINER Apache ORC project <de...@orc.apache.org>
 
 RUN apt-get update
 RUN apt-get install -y \
diff --git a/docker/ubuntu18/Dockerfile b/docker/ubuntu18/Dockerfile
index 49b9ee5..85411ba 100644
--- a/docker/ubuntu18/Dockerfile
+++ b/docker/ubuntu18/Dockerfile
@@ -18,7 +18,7 @@
 #
 
 FROM ubuntu:18.04
-MAINTAINER Owen O'Malley <ow...@hortonworks.com>
+MAINTAINER Apache ORC project <de...@orc.apache.org>
 
 RUN ln -fs /usr/share/zoneinfo/America/Los_Angeles /etc/localtime
 RUN apt-get update
diff --git a/docker/ubuntu20/Dockerfile b/docker/ubuntu20-clang/Dockerfile
similarity index 90%
copy from docker/ubuntu20/Dockerfile
copy to docker/ubuntu20-clang/Dockerfile
index 06cccf8..b4ed323 100644
--- a/docker/ubuntu20/Dockerfile
+++ b/docker/ubuntu20-clang/Dockerfile
@@ -14,17 +14,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# ORC compile for Ubuntu 20
+# ORC compile for Ubuntu 20 with clang
 #
 
 FROM ubuntu:20.04
+MAINTAINER Apache ORC project <de...@orc.apache.org>
 
 RUN ln -fs /usr/share/zoneinfo/America/Los_Angeles /etc/localtime
 RUN apt-get update
 RUN apt-get install -y \
   cmake \
-  gcc \
-  g++ \
+  clang \
   git \
   libsasl2-dev \
   libssl-dev \
@@ -34,6 +34,9 @@ RUN apt-get install -y \
   tzdata
 RUN update-java-alternatives --set java-1.8.0-openjdk-amd64
 
+ENV CC=clang
+ENV CXX=clang++
+
 WORKDIR /root
 VOLUME /root/.m2/repository
 
diff --git a/docker/ubuntu20/Dockerfile b/docker/ubuntu20/Dockerfile
index 06cccf8..cdca30d 100644
--- a/docker/ubuntu20/Dockerfile
+++ b/docker/ubuntu20/Dockerfile
@@ -18,6 +18,7 @@
 #
 
 FROM ubuntu:20.04
+MAINTAINER Apache ORC project <de...@orc.apache.org>
 
 RUN ln -fs /usr/share/zoneinfo/America/Los_Angeles /etc/localtime
 RUN apt-get update
diff --git a/site/_docs/building.md b/site/_docs/building.md
index 9ba58c6..6f56289 100644
--- a/site/_docs/building.md
+++ b/site/_docs/building.md
@@ -25,13 +25,13 @@ You'll want to install the usual set of developer tools, but at least:
 For each version of Linux, please check the corresponding Dockerfile, which
 is in the docker subdirectory, for the list of packages required to build ORC:
 
-* [CentOS 6]({{ page.dockerUrl }}/centos6/Dockerfile)
 * [CentOS 7]({{ page.dockerUrl }}/centos7/Dockerfile)
+* [CentOS 8]({{ page.dockerUrl }}/centos8/Dockerfile)
 * [Debian 8]({{ page.dockerUrl }}/debian8/Dockerfile)
 * [Debian 9]({{ page.dockerUrl }}/debian9/Dockerfile)
-* [Ubuntu 14]({{ page.dockerUrl }}/ubuntu14/Dockerfile)
 * [Ubuntu 16]({{ page.dockerUrl }}/ubuntu16/Dockerfile)
 * [Ubuntu 18]({{ page.dockerUrl }}/ubuntu18/Dockerfile)
+* [Ubuntu 20]({{ page.dockerUrl }}/ubuntu20/Dockerfile)
 
 To build a normal release: