From dd5c6b312969de8183a21c367fd067fa2e9465c4 Mon Sep 17 00:00:00 2001 From: Andriy Binetsky Date: Tue, 2 Jan 2018 13:00:43 +0100 Subject: [PATCH] introduce the environment variable CASSANDRA_CONFIG_TEMPLATE_FOLDER to allow cassandra configuration via config map --- 2.1/docker-entrypoint.sh | 6 +++++- 2.2/docker-entrypoint.sh | 6 +++++- 3.0/docker-entrypoint.sh | 6 +++++- 3.11/docker-entrypoint.sh | 6 +++++- docker-entrypoint.sh | 6 +++++- 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/2.1/docker-entrypoint.sh b/2.1/docker-entrypoint.sh index 16d183a..8ecd270 100755 --- a/2.1/docker-entrypoint.sh +++ b/2.1/docker-entrypoint.sh @@ -31,7 +31,11 @@ if [ "$1" = 'cassandra' ]; then : ${CASSANDRA_SEEDS:="cassandra"} fi : ${CASSANDRA_SEEDS:="$CASSANDRA_BROADCAST_ADDRESS"} - + + if [ -n "$CASSANDRA_CONFIG_TEMPLATE_FOLDER" ]; then + cp $CASSANDRA_CONFIG_TEMPLATE_FOLDER/cassandra.yaml $CASSANDRA_CONFIG/cassandra.yaml + fi + sed -ri 's/(- seeds:).*/\1 "'"$CASSANDRA_SEEDS"'"/' "$CASSANDRA_CONFIG/cassandra.yaml" for yaml in \ diff --git a/2.2/docker-entrypoint.sh b/2.2/docker-entrypoint.sh index 16d183a..8ecd270 100755 --- a/2.2/docker-entrypoint.sh +++ b/2.2/docker-entrypoint.sh @@ -31,7 +31,11 @@ if [ "$1" = 'cassandra' ]; then : ${CASSANDRA_SEEDS:="cassandra"} fi : ${CASSANDRA_SEEDS:="$CASSANDRA_BROADCAST_ADDRESS"} - + + if [ -n "$CASSANDRA_CONFIG_TEMPLATE_FOLDER" ]; then + cp $CASSANDRA_CONFIG_TEMPLATE_FOLDER/cassandra.yaml $CASSANDRA_CONFIG/cassandra.yaml + fi + sed -ri 's/(- seeds:).*/\1 "'"$CASSANDRA_SEEDS"'"/' "$CASSANDRA_CONFIG/cassandra.yaml" for yaml in \ diff --git a/3.0/docker-entrypoint.sh b/3.0/docker-entrypoint.sh index 16d183a..8ecd270 100755 --- a/3.0/docker-entrypoint.sh +++ b/3.0/docker-entrypoint.sh @@ -31,7 +31,11 @@ if [ "$1" = 'cassandra' ]; then : ${CASSANDRA_SEEDS:="cassandra"} fi : ${CASSANDRA_SEEDS:="$CASSANDRA_BROADCAST_ADDRESS"} - + + if [ -n "$CASSANDRA_CONFIG_TEMPLATE_FOLDER" ]; then + cp $CASSANDRA_CONFIG_TEMPLATE_FOLDER/cassandra.yaml $CASSANDRA_CONFIG/cassandra.yaml + fi + sed -ri 's/(- seeds:).*/\1 "'"$CASSANDRA_SEEDS"'"/' "$CASSANDRA_CONFIG/cassandra.yaml" for yaml in \ diff --git a/3.11/docker-entrypoint.sh b/3.11/docker-entrypoint.sh index 16d183a..8ecd270 100755 --- a/3.11/docker-entrypoint.sh +++ b/3.11/docker-entrypoint.sh @@ -31,7 +31,11 @@ if [ "$1" = 'cassandra' ]; then : ${CASSANDRA_SEEDS:="cassandra"} fi : ${CASSANDRA_SEEDS:="$CASSANDRA_BROADCAST_ADDRESS"} - + + if [ -n "$CASSANDRA_CONFIG_TEMPLATE_FOLDER" ]; then + cp $CASSANDRA_CONFIG_TEMPLATE_FOLDER/cassandra.yaml $CASSANDRA_CONFIG/cassandra.yaml + fi + sed -ri 's/(- seeds:).*/\1 "'"$CASSANDRA_SEEDS"'"/' "$CASSANDRA_CONFIG/cassandra.yaml" for yaml in \ diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 16d183a..8ecd270 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -31,7 +31,11 @@ if [ "$1" = 'cassandra' ]; then : ${CASSANDRA_SEEDS:="cassandra"} fi : ${CASSANDRA_SEEDS:="$CASSANDRA_BROADCAST_ADDRESS"} - + + if [ -n "$CASSANDRA_CONFIG_TEMPLATE_FOLDER" ]; then + cp $CASSANDRA_CONFIG_TEMPLATE_FOLDER/cassandra.yaml $CASSANDRA_CONFIG/cassandra.yaml + fi + sed -ri 's/(- seeds:).*/\1 "'"$CASSANDRA_SEEDS"'"/' "$CASSANDRA_CONFIG/cassandra.yaml" for yaml in \