This is an automated email from the ASF dual-hosted git repository. omalley pushed a commit to branch orc-447 in repository https://gitbox.apache.org/repos/asf/orc.git
commit c577874841ecca3875278318f720af917e22835e Author: Owen O'Malley <[email protected]> AuthorDate: Wed Dec 19 09:21:25 2018 -0800 ORC-447: Update docker to use shared volume for m2 cache. Signed-off-by: Owen O'Malley <[email protected]> --- docker/centos6/Dockerfile | 2 ++ docker/centos7/Dockerfile | 2 ++ docker/debian8/Dockerfile | 2 ++ docker/debian9/Dockerfile | 2 ++ docker/run-all.sh | 3 ++- docker/ubuntu14/Dockerfile | 2 ++ docker/ubuntu16-clang5/Dockerfile | 1 + docker/ubuntu16/Dockerfile | 1 + docker/ubuntu18/Dockerfile | 1 + 9 files changed, 15 insertions(+), 1 deletion(-) diff --git a/docker/centos6/Dockerfile b/docker/centos6/Dockerfile index 9f6a801..6fffbb7 100644 --- a/docker/centos6/Dockerfile +++ b/docker/centos6/Dockerfile @@ -60,6 +60,8 @@ RUN cd snappy-1.1.3 && \ ./configure && \ make install +VOLUME /root/.m2/repository + CMD git clone https://github.com/apache/orc.git -b master && \ mkdir orc/build && \ cd orc/build && \ diff --git a/docker/centos7/Dockerfile b/docker/centos7/Dockerfile index 8951a1d..2074fde 100644 --- a/docker/centos7/Dockerfile +++ b/docker/centos7/Dockerfile @@ -52,6 +52,8 @@ RUN cd snappy-1.1.3 && \ ./configure && \ make install +VOLUME /root/.m2/repository + CMD git clone https://github.com/apache/orc.git -b master && \ mkdir orc/build && \ cd orc/build && \ diff --git a/docker/debian8/Dockerfile b/docker/debian8/Dockerfile index 68a7b24..ab8d4c7 100644 --- a/docker/debian8/Dockerfile +++ b/docker/debian8/Dockerfile @@ -51,6 +51,8 @@ RUN cd snappy-1.1.3 && \ ./configure && \ make install +VOLUME /root/.m2/repository + CMD git clone https://github.com/apache/orc.git -b master && \ mkdir orc/build && \ cd orc/build && \ diff --git a/docker/debian9/Dockerfile b/docker/debian9/Dockerfile index 54f6e59..06a5a50 100644 --- a/docker/debian9/Dockerfile +++ b/docker/debian9/Dockerfile @@ -34,6 +34,8 @@ 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 && \ diff --git a/docker/run-all.sh b/docker/run-all.sh index 2dee97c..d770bae 100755 --- a/docker/run-all.sh +++ b/docker/run-all.sh @@ -21,6 +21,7 @@ BRANCH=$2 CLONE="git clone $URL -b $BRANCH" MAKEDIR="mkdir orc/build && cd orc/build" +VOLUME="--volume m2cache:/root/.m2/repository" mkdir -p logs start=`date` @@ -43,7 +44,7 @@ for os in `cat os-list.txt`; do OPTS="" ;; esac - docker run "orc-$os" /bin/bash -c \ + docker run $VOLUME "orc-$os" /bin/bash -c \ "$CLONE && $MAKEDIR && cmake $OPTS .. && make package test-out" \ > logs/$os-test.log 2>&1 || exit 1 done diff --git a/docker/ubuntu14/Dockerfile b/docker/ubuntu14/Dockerfile index 6cf29af..008207f 100644 --- a/docker/ubuntu14/Dockerfile +++ b/docker/ubuntu14/Dockerfile @@ -49,6 +49,8 @@ RUN cd snappy-1.1.3 && \ ./configure && \ make install +VOLUME /root/.m2/repository + CMD git clone https://github.com/apache/orc.git -b master && \ mkdir orc/build && \ cd orc/build && \ diff --git a/docker/ubuntu16-clang5/Dockerfile b/docker/ubuntu16-clang5/Dockerfile index f21c91f..f317863 100644 --- a/docker/ubuntu16-clang5/Dockerfile +++ b/docker/ubuntu16-clang5/Dockerfile @@ -40,6 +40,7 @@ ENV CC=clang-5.0 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 && \ diff --git a/docker/ubuntu16/Dockerfile b/docker/ubuntu16/Dockerfile index 41d65e7..5eca40b 100644 --- a/docker/ubuntu16/Dockerfile +++ b/docker/ubuntu16/Dockerfile @@ -34,6 +34,7 @@ RUN apt-get install -y \ tzdata WORKDIR /root +VOLUME /root/.m2/repository CMD git clone https://github.com/apache/orc.git -b master && \ mkdir orc/build && \ diff --git a/docker/ubuntu18/Dockerfile b/docker/ubuntu18/Dockerfile index 73c07a4..650fa20 100644 --- a/docker/ubuntu18/Dockerfile +++ b/docker/ubuntu18/Dockerfile @@ -36,6 +36,7 @@ RUN apt-get install -y \ 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 && \
