Skip to content

Commit

Permalink
ORC-564: Remove the build command from the docker files.
Browse files Browse the repository at this point in the history
Signed-off-by: Owen O'Malley <omalley@apache.org>
  • Loading branch information
omalley committed Oct 28, 2019
1 parent 5234c5d commit 3a7b700
Show file tree
Hide file tree
Showing 11 changed files with 90 additions and 57 deletions.
27 changes: 20 additions & 7 deletions docker/README
Original file line number Diff line number Diff line change
@@ -1,14 +1,27 @@
These scripts are useful for testing on different versions of Linux
assuming that you are running a version of Linux that has docker
available.
These scripts are useful for building and testing on different versions of
Linux.

ORC is currently supported on:
* CentOS 6, 7, and 8
* Debian 8, 9, and 10
* Ubuntu 14, 16, and 18

To test against all of the Linux OSes against Apache's master branch:
1. ./run-all.sh apache master
1. cd docker
2. ./run-all.sh apache master

The scripts are:
1. run-all.sh *owner* *branch* - test the given owner's branch on all OSes
2. run-one.sh *owner* *branch* *os* - test the owner's branch on one OS
3. reinit.sh - rebuild all of the base images without the image cache

To run the docker scripts:
1. cd $os
A base image for each OS is built using:
1. cd docker/$os
2. docker build -t orc-$os .
3. docker run orc-$os

If you want to test the download version on $os (assuming you are in the ORC
top level directory):
1. docker run -v`pwd`:/root/orc orc-$os

To clean up docker:
1. docker container prune
Expand Down
12 changes: 7 additions & 5 deletions docker/centos6/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,10 @@ RUN cd snappy-1.1.3 && \
VOLUME /root/.m2/repository
CMD git clone https://github.com/apache/orc.git -b master && \
mkdir orc/build && \
cd orc/build && \
cmake .. && \
make package test-out
CMD if [ ! -d orc ]; then \
git clone https://github.com/apache/orc.git -b master; \
fi && \
mkdir build && \
cd build && \
cmake -DSNAPPY_HOME=/usr/local -DPROTOBUF_HOME=/usr/local ../orc && \
make package test-out
12 changes: 7 additions & 5 deletions docker/centos7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,10 @@ RUN cd snappy-1.1.3 && \
VOLUME /root/.m2/repository
CMD git clone https://github.com/apache/orc.git -b master && \
mkdir orc/build && \
cd orc/build && \
cmake .. && \
make package test-out
CMD if [ ! -d orc ]; then \
git clone https://github.com/apache/orc.git -b master; \
fi && \
mkdir build && \
cd build && \
cmake -DSNAPPY_HOME=/usr/local ../orc && \
make package test-out
12 changes: 7 additions & 5 deletions docker/centos8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,10 @@ WORKDIR /root
VOLUME /root/.m2/repository
CMD git clone https://github.com/apache/orc.git -b master && \
mkdir orc/build && \
cd orc/build && \
cmake .. && \
make package test-out
CMD if [ ! -d orc ]; then \
git clone https://github.com/apache/orc.git -b master; \
fi && \
mkdir build && \
cd build && \
cmake ../orc && \
make package test-out
12 changes: 7 additions & 5 deletions docker/debian10/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@ WORKDIR /root
VOLUME /root/.m2/repository
CMD git clone https://github.com/apache/orc.git -b master && \
mkdir orc/build && \
cd orc/build && \
cmake .. && \
make package test-out
CMD if [ ! -d orc ]; then \
git clone https://github.com/apache/orc.git -b master; \
fi && \
mkdir build && \
cd build && \
cmake ../orc && \
make package test-out
12 changes: 7 additions & 5 deletions docker/debian8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,10 @@ RUN cd snappy-1.1.3 && \
VOLUME /root/.m2/repository
CMD git clone https://github.com/apache/orc.git -b master && \
mkdir orc/build && \
cd orc/build && \
cmake .. && \
make package test-out
CMD if [ ! -d orc ]; then \
git clone https://github.com/apache/orc.git -b master; \
fi && \
mkdir build && \
cd build && \
cmake -DSNAPPY_HOME=/usr/local ../orc && \
make package test-out
12 changes: 7 additions & 5 deletions docker/debian9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@ WORKDIR /root
VOLUME /root/.m2/repository
CMD git clone https://github.com/apache/orc.git -b master && \
mkdir orc/build && \
cd orc/build && \
cmake .. && \
make package test-out
CMD if [ ! -d orc ]; then \
git clone https://github.com/apache/orc.git -b master; \
fi && \
mkdir build && \
cd build && \
cmake ../orc && \
make package test-out
12 changes: 7 additions & 5 deletions docker/ubuntu14/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,10 @@ RUN cd snappy-1.1.3 && \
VOLUME /root/.m2/repository
CMD git clone https://github.com/apache/orc.git -b master && \
mkdir orc/build && \
cd orc/build && \
cmake .. && \
make package test-out
CMD if [ ! -d orc ]; then \
git clone https://github.com/apache/orc.git -b master; \
fi && \
mkdir build && \
cd build && \
cmake -DSNAPPY_HOME=/usr/local ../orc && \
make package test-out
12 changes: 7 additions & 5 deletions docker/ubuntu16-clang5/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,10 @@ ENV CXX=clang++-5.0
WORKDIR /root
VOLUME /root/.m2/repository
CMD git clone https://github.com/apache/orc.git -b master && \
mkdir orc/build && \
cd orc/build && \
cmake .. && \
make package test-out
CMD if [ ! -d orc ]; then \
git clone https://github.com/apache/orc.git -b master; \
fi && \
mkdir build && \
cd build && \
cmake ../orc && \
make package test-out
12 changes: 7 additions & 5 deletions docker/ubuntu16/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@ RUN apt-get install -y \
WORKDIR /root
VOLUME /root/.m2/repository
CMD git clone https://github.com/apache/orc.git -b master && \
mkdir orc/build && \
cd orc/build && \
cmake .. && \
make package test-out
CMD if [ ! -d orc ]; then \
git clone https://github.com/apache/orc.git -b master; \
fi && \
mkdir build && \
cd build && \
cmake ../orc && \
make package test-out
12 changes: 7 additions & 5 deletions docker/ubuntu18/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,10 @@ RUN update-java-alternatives --set java-1.8.0-openjdk-amd64
WORKDIR /root
VOLUME /root/.m2/repository
CMD git clone https://github.com/apache/orc.git -b master && \
mkdir orc/build && \
cd orc/build && \
cmake .. && \
make package test-out
CMD if [ ! -d orc ]; then \
git clone https://github.com/apache/orc.git -b master; \
fi && \
mkdir build && \
cd build && \
cmake ../orc && \
make package test-out

0 comments on commit 3a7b700

Please sign in to comment.