Change to use /schema sql to initialize cassandra

Comcast · Nov 18, 2015 · 1b87d34 · 1b87d34
1 parent abc8880
commit 1b87d34
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 394 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -2,8 +2,10 @@ FROM java:8
 
 RUN mkdir -p /app/src/cmb
 ADD . /app/src/cmb
+
 WORKDIR /app/src/cmb
+ENV ROOTDIR=/app/src/cmb
 
 EXPOSE 6059 6061
 
-CMD ./docker/cmb/bin/start.sh
+CMD $ROOTDIR/docker/cmb/bin/start.sh
diff --git a/Dockerfile-cassandra b/Dockerfile-cassandra
@@ -0,0 +1,4 @@
+FROM cassandra:2.1
+
+# Add initial data for cmb
+ADD ./schema/cassandra_1.2.cql.schema /tmp/cassandra_1.2.cql.schema
diff --git a/docker/redis/Dockerfile → Dockerfile-redis b/docker/redis/Dockerfile → Dockerfile-redis
@@ -1,4 +1,4 @@
 FROM redis:2.6
 
-COPY redis.conf /usr/local/etc/redis/redis.conf
+COPY ./docker/redis/redis.conf /usr/local/etc/redis/redis.conf
 CMD [ "redis-server", "/usr/local/etc/redis/redis.conf" ]
diff --git a/docker/cassandra/Dockerfile b/docker/cassandra/Dockerfile