From 3c86680e532b959bd637b6c093b3916ae5bcee11 Mon Sep 17 00:00:00 2001 From: "Thomas Nelson Jr (arthurdent3) tn1381@att.com" Date: Tue, 13 Mar 2018 20:10:04 -0400 Subject: Docker update and POM fix Update the docker for cassandra to change ownership of imported files. Update the POM to fix bug Numerous bug fixes fro Logging and Error reporting. Change-Id: I518807f9796734134341ebefd109219050a84b51 Issue-ID: MUSIC-56, MUSIC-57, MUSIC-58 Signed-off-by: Thomas Nelson Jr (arthurdent3) tn1381@att.com --- distribution/cassandra/docker-entrypoint.sh | 5 +++++ distribution/dockermusic/start.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'distribution') diff --git a/distribution/cassandra/docker-entrypoint.sh b/distribution/cassandra/docker-entrypoint.sh index cec4587b..2e2c657e 100644 --- a/distribution/cassandra/docker-entrypoint.sh +++ b/distribution/cassandra/docker-entrypoint.sh @@ -1,6 +1,11 @@ #!/bin/bash set -e +for f in /docker-entrypoint-initdb.d/*.cql; do + chown cassandra.root "$f" +done + + # first arg is `-f` or `--some-option` # or there are no args if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then diff --git a/distribution/dockermusic/start.sh b/distribution/dockermusic/start.sh index 57b05890..c3763c45 100644 --- a/distribution/dockermusic/start.sh +++ b/distribution/dockermusic/start.sh @@ -40,7 +40,7 @@ docker network create music-net; # Start Cassandra docker run -d --rm --name music-db --network music-net \ -p "7000:7000" -p "7001:7001" -p "7199:7199" -p "9042:9042" -p "9160:9160" \ --e CASSNAME=${CASS_USERNAME} \ +-e CASSUSER=${CASS_USERNAME} \ -e CASSPASS=${CASS_PASSWORD} \ ${CASS_IMG}; -- cgit 1.2.3-korg