diff options
| author |   Thomas Nelson <tn1381@att.com> | 2018-03-14 00:39:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-14 00:39:39 +0000 |
| commit | ed32276d7d097fb9b53c930133f86a99db6a35dc (patch) | |
| tree | 0653a737c496a197d4e373245b5a490a40cdc3b0 /distribution | |
| parent | 0193eb29ad8bdbd4491afc7f32ce8362898e2ded (diff) | |
| parent | 3c86680e532b959bd637b6c093b3916ae5bcee11 (diff) | |
Merge "Docker update and POM fix"
Diffstat (limited to 'distribution')
| -rw-r--r-- | distribution/cassandra/docker-entrypoint.sh | 5 | ||||
| -rw-r--r-- | distribution/dockermusic/start.sh | 2 |
2 files changed, 6 insertions, 1 deletions
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}; |