From f11446020433bafe3484788a29da827e5cc445c5 Mon Sep 17 00:00:00 2001
From: Patrick Tescher <pat2man@gmail.com>
Date: Wed, 29 Jul 2015 12:01:08 -0700
Subject: [PATCH] Adjust permissions so that Cassandra can run without root
 access
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This allows both non root access as well as running with —user=<random
id>
---
 examples/cassandra/image/Dockerfile     | 11 ++++++++++-
 examples/cassandra/image/cassandra.yaml |  2 +-
 examples/cassandra/image/logback.xml    | 13 +++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 examples/cassandra/image/logback.xml

diff --git a/examples/cassandra/image/Dockerfile b/examples/cassandra/image/Dockerfile
index b6b274a75e2..ca7f1566e22 100644
--- a/examples/cassandra/image/Dockerfile
+++ b/examples/cassandra/image/Dockerfile
@@ -15,8 +15,17 @@ RUN apt-get update
 RUN apt-get -qq -y install procps cassandra
 
 COPY cassandra.yaml /etc/cassandra/cassandra.yaml
+COPY logback.xml /etc/cassandra/logback.xml
 COPY run.sh /run.sh
 COPY kubernetes-cassandra.jar /kubernetes-cassandra.jar
-RUN chmod a+x /run.sh
+
+RUN chmod a+x /run.sh && \
+    mkdir -p /cassandra_data/data && \
+    chown -R cassandra.cassandra /etc/cassandra /cassandra_data && \
+    chmod o+w -R /etc/cassandra /cassandra_data
+
+VOLUME ["/cassandra_data/data"]    
+
+USER cassandra
 
 CMD /run.sh
diff --git a/examples/cassandra/image/cassandra.yaml b/examples/cassandra/image/cassandra.yaml
index b1543f2405b..f409e82025b 100644
--- a/examples/cassandra/image/cassandra.yaml
+++ b/examples/cassandra/image/cassandra.yaml
@@ -215,7 +215,7 @@ counter_cache_save_period: 7200
 
 # saved caches
 # If not set, the default directory is $CASSANDRA_HOME/data/saved_caches.
-saved_caches_directory: /var/lib/cassandra/saved_caches
+saved_caches_directory: /cassandra_data/saved_caches
 
 # commitlog_sync may be either "periodic" or "batch." 
 # When in batch mode, Cassandra won't ack writes until the commit log
diff --git a/examples/cassandra/image/logback.xml b/examples/cassandra/image/logback.xml
new file mode 100644
index 00000000000..2bb893e5420
--- /dev/null
+++ b/examples/cassandra/image/logback.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<configuration scan="true">
+  <jmxConfigurator/>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%-5level %date{HH:mm:ss,SSS} %msg%n</pattern>
+    </encoder>
+  </appender>
+  <root level="INFO">
+    <appender-ref ref="STDOUT"/>
+  </root>
+  <logger name="com.thinkaurelius.thrift" level="ERROR"/>
+</configuration>
\ No newline at end of file