From ff1343f770e4aa3e1f237cb72717c3ccb5d091b2 Mon Sep 17 00:00:00 2001
From: stackedsax <ascammon@hotmail.com>
Date: Tue, 5 Dec 2017 01:26:02 -0800
Subject: [PATCH] Some updates for building new containers

---
 contrib/blueflood-docker/Dockerfile           | 4 ++--
 contrib/blueflood-docker/docker-entrypoint.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/blueflood-docker/Dockerfile b/contrib/blueflood-docker/Dockerfile
index 07564d0aa..532037261 100644
--- a/contrib/blueflood-docker/Dockerfile
+++ b/contrib/blueflood-docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM java:7
+FROM java:8
 
 MAINTAINER gaurav.bajaj@rackspace.com
 
@@ -7,7 +7,7 @@ RUN apt-get install -y netcat
 RUN apt-get install -y git
 RUN apt-get install -y python python-dev python-pip python-virtualenv && \
     rm -rf /var/lib/apt/lists/*
-RUN pip install cqlsh==4.1.1
+RUN pip install cqlsh==4.1.1 thrift==0.9.3
 
 COPY ES-Setup /ES-Setup
 COPY load.cdl /blueflood.cdl
diff --git a/contrib/blueflood-docker/docker-entrypoint.sh b/contrib/blueflood-docker/docker-entrypoint.sh
index 7f0d736bc..b3fc8e484 100755
--- a/contrib/blueflood-docker/docker-entrypoint.sh
+++ b/contrib/blueflood-docker/docker-entrypoint.sh
@@ -40,7 +40,7 @@ done
 export CASSANDRA_HOSTS="$CASSANDRA_HOST:9160"
 export CASSANDRA_BINXPORT_HOSTS="$CASSANDRA_HOST:9042"
 
-if [ $ROLLUP_KEYSPACE != "DATA" ]
+if [ "$ROLLUP_KEYSPACE" != "DATA" ] && [ -n "$ROLLUP_KEYSPACE" ]
 then
     sed -i "s/\"DATA\"/\"$ROLLUP_KEYSPACE\"/g" blueflood.cdl
 fi