This is an automated email from the ASF dual-hosted git repository.
omalley pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/orc.git
The following commit(s) were added to refs/heads/master by this push:
new 0321189 ORC-423 Add debian 9 and ubuntu 18 to the docker scripts
0321189 is described below
commit 0321189c39df8ccdd685d72944abcc7570d25a7b
Author: Owen O'Malley <[email protected]>
AuthorDate: Mon Oct 29 15:41:52 2018 -0700
ORC-423 Add debian 9 and ubuntu 18 to the docker scripts
Fixes #332
Signed-off-by: Owen O'Malley <[email protected]>
---
docker/{ubuntu12 => debian9}/Dockerfile | 36 +++++++--------------------------
docker/os-list.txt | 3 ++-
docker/run-all.sh | 4 ++++
3 files changed, 13 insertions(+), 30 deletions(-)
diff --git a/docker/ubuntu12/Dockerfile b/docker/debian9/Dockerfile
similarity index 59%
rename from docker/ubuntu12/Dockerfile
rename to docker/debian9/Dockerfile
index 85904f3..54f6e59 100644
--- a/docker/ubuntu12/Dockerfile
+++ b/docker/debian9/Dockerfile
@@ -14,50 +14,28 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# ORC compile for Ubuntu 12
+# ORC compile for Debian 9
#
-FROM ubuntu:12.04
+FROM debian:9
MAINTAINER Owen O'Malley <[email protected]>
RUN apt-get update
-RUN apt-get install -y python-software-properties
-RUN add-apt-repository -y ppa:openjdk-r/ppa
-RUN apt-get update
RUN apt-get install -y \
- autoconf \
cmake \
gcc \
g++ \
git \
- libtool \
- make \
- maven \
+ libsasl2-dev \
+ libssl-dev \
openjdk-8-jdk \
- pkg-config \
- tar \
- wget
+ make \
+ maven
WORKDIR /root
-# install a local build of protobuf
-RUN wget "https://github.com/protocolbuffers/protobuf/archive/v2.5.0.tar.gz"; \
- -O protobuf.tgz
-RUN tar xzf protobuf.tgz
-RUN cd protobuf-2.5.0 && \
- autoreconf -f -i -Wall,no-obsolete && \
- ./configure --enable-shared=no&& \
- make install
-# install a local build of snappy
-RUN wget "https://github.com/google/snappy/archive/1.1.3.tar.gz"; \
- -O snappy.tgz
-RUN tar xzf snappy.tgz
-RUN cd snappy-1.1.3 && \
- ./autogen.sh && \
- ./configure && \
- make install
CMD git clone https://github.com/apache/orc.git -b master && \
mkdir orc/build && \
cd orc/build && \
- cmake .. && \
+ cmake .. && \
make package test-out
diff --git a/docker/os-list.txt b/docker/os-list.txt
index dcb50f0..7d38a34 100644
--- a/docker/os-list.txt
+++ b/docker/os-list.txt
@@ -1,6 +1,7 @@
centos6
centos7
debian8
-ubuntu12
+debian9
ubuntu14
ubuntu16
+ubuntu18
diff --git a/docker/run-all.sh b/docker/run-all.sh
index 2dee97c..c781e9b 100755
--- a/docker/run-all.sh
+++ b/docker/run-all.sh
@@ -39,6 +39,10 @@ for os in `cat os-list.txt`; do
centos7|debian8|ubuntu14)
OPTS="-DSNAPPY_HOME=/usr/local"
;;
+ debian9)
+ # there is a bug in debian 9 that causes surefire to fail
+ OPTS="-DBUILD_JAVA=OFF"
+ ;;
*)
OPTS=""
;;
