Merge pull request #158 from infosiftr/chown

Only chown things in the entrypoint that are not already owned by cassandra

Author: tianon

2.1/docker-entrypoint.sh

@@ -9,7 +9,8 @@ fi
 
 # allow the container to be started with `--user`
 if [ "$1" = 'cassandra' -a "$(id -u)" = '0' ]; then
-	chown -R cassandra /var/lib/cassandra /var/log/cassandra "$CASSANDRA_CONFIG"
+	find /var/lib/cassandra /var/log/cassandra "$CASSANDRA_CONFIG" \
+		\! -user cassandra -exec chown cassandra '{}' +
 	exec gosu cassandra "$BASH_SOURCE" "$@"
 fi
 

2.2/docker-entrypoint.sh

@@ -9,7 +9,8 @@ fi
 
 # allow the container to be started with `--user`
 if [ "$1" = 'cassandra' -a "$(id -u)" = '0' ]; then
-	chown -R cassandra /var/lib/cassandra /var/log/cassandra "$CASSANDRA_CONFIG"
+	find /var/lib/cassandra /var/log/cassandra "$CASSANDRA_CONFIG" \
+		\! -user cassandra -exec chown cassandra '{}' +
 	exec gosu cassandra "$BASH_SOURCE" "$@"
 fi
 

3.0/docker-entrypoint.sh

@@ -9,7 +9,8 @@ fi
 
 # allow the container to be started with `--user`
 if [ "$1" = 'cassandra' -a "$(id -u)" = '0' ]; then
-	chown -R cassandra /var/lib/cassandra /var/log/cassandra "$CASSANDRA_CONFIG"
+	find /var/lib/cassandra /var/log/cassandra "$CASSANDRA_CONFIG" \
+		\! -user cassandra -exec chown cassandra '{}' +
 	exec gosu cassandra "$BASH_SOURCE" "$@"
 fi
 

3.11/docker-entrypoint.sh

@@ -9,7 +9,8 @@ fi
 
 # allow the container to be started with `--user`
 if [ "$1" = 'cassandra' -a "$(id -u)" = '0' ]; then
-	chown -R cassandra /var/lib/cassandra /var/log/cassandra "$CASSANDRA_CONFIG"
+	find /var/lib/cassandra /var/log/cassandra "$CASSANDRA_CONFIG" \
+		\! -user cassandra -exec chown cassandra '{}' +
 	exec gosu cassandra "$BASH_SOURCE" "$@"
 fi
 

docker-entrypoint.sh

@@ -9,7 +9,8 @@ fi
 
 # allow the container to be started with `--user`
 if [ "$1" = 'cassandra' -a "$(id -u)" = '0' ]; then
-	chown -R cassandra /var/lib/cassandra /var/log/cassandra "$CASSANDRA_CONFIG"
+	find /var/lib/cassandra /var/log/cassandra "$CASSANDRA_CONFIG" \
+		\! -user cassandra -exec chown cassandra '{}' +
 	exec gosu cassandra "$BASH_SOURCE" "$@"
 fi