From b5cf49fc4e885e9b7c13553c2c7b3404e6ce9a5e Mon Sep 17 00:00:00 2001 From: neo Date: Fri, 15 Jan 2016 15:44:41 +0100 Subject: [PATCH] Small fixes on data-serving benchmark. Push to dockerhub only on master branch. --- .travis.yml | 2 +- benchmarks/data-serving/client/Dockerfile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1c21e33d4..d7031c9af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,4 +73,4 @@ script: # - docker build -t $DH_REPO:$IMG_TAG $DF_PATH # - docker push $DH_REPO; - travis_wait 40 docker build -t $DH_REPO:$IMG_TAG $DF_PATH - - travis_wait 40 docker push $DH_REPO; + - test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && travis_wait 40 docker push $DH_REPO; diff --git a/benchmarks/data-serving/client/Dockerfile b/benchmarks/data-serving/client/Dockerfile index fc6171b11..d1c4cfc27 100644 --- a/benchmarks/data-serving/client/Dockerfile +++ b/benchmarks/data-serving/client/Dockerfile @@ -7,11 +7,11 @@ RUN apt-get install software-properties-common -y \ && buildDeps='oracle-java7-installer python' \ && set -x \ && apt-get install -y $buildDeps --no-install-recommends \ - && apt-get autoremove && apt-get clean && apt-get upgrade\ - && groupadd -r cassandra && useradd -r -g users cassandra + && apt-get autoremove && apt-get clean && apt-get upgrade -y \ + && groupadd -r cassandra && useradd -r -g cassandra cassandra RUN wget -q https://github.com/brianfrankcooper/YCSB/releases/download/0.3.0/ycsb-0.3.0.tar.gz -O /ycsb-0.3.0.tar.gz \ && tar -xzf /ycsb-0.3.0.tar.gz && rm /ycsb-0.3.0.tar.gz && mv /ycsb-0.3.0 /ycsb \ - && chown cassandra:users -R /ycsb/workloads + && chown cassandra:cassandra -R /ycsb/workloads USER cassandra