Permalink
Browse files

Merge ff1343f into 4848335

  • Loading branch information...
stackedsax committed Dec 5, 2017
2 parents 4848335 + ff1343f commit 07a438de1278eee965a462abb36a2708e57b1aa9
Showing with 3 additions and 3 deletions.
  1. +2 −2 contrib/blueflood-docker/Dockerfile
  2. +1 −1 contrib/blueflood-docker/docker-entrypoint.sh
@@ -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
@@ -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

0 comments on commit 07a438d

Please sign in to comment.