Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some updates for building new containers #816

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Some updates for building new containers #816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions contrib/blueflood-docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM java:7
FROM java:8

MAINTAINER gaurav.bajaj@rackspace.com

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion contrib/blueflood-docker/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down