Small fixes on data-serving benchmark.

Push to dockerhub only on master branch.

.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;

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