From f2bbe7e1db0617b6e631b9fbea9c8a1cd45a25a4 Mon Sep 17 00:00:00 2001 From: Yura Date: Fri, 11 May 2018 17:56:11 +0300 Subject: [PATCH] reformat dockerfile --- Dockerfile.cassandra | 3 ++- entrypoint-with-db-init.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile.cassandra b/Dockerfile.cassandra index 9fe1ee528a..b68b78a665 100644 --- a/Dockerfile.cassandra +++ b/Dockerfile.cassandra @@ -3,10 +3,11 @@ FROM cassandra WORKDIR /opt/cassandra COPY dao/src/main/resources/cassandra/schema.cql /opt/cassandra + COPY entrypoint-with-db-init.sh /opt/cassandra/entrypoint-with-db-init.sh RUN chmod +x /opt/cassandra/entrypoint-with-db-init.sh ENTRYPOINT ["/opt/cassandra/entrypoint-with-db-init.sh"] -CMD ["cassandra", "-f"] +CMD ["cassandra", "-f"] diff --git a/entrypoint-with-db-init.sh b/entrypoint-with-db-init.sh index fee2cf482e..3fb3bce965 100644 --- a/entrypoint-with-db-init.sh +++ b/entrypoint-with-db-init.sh @@ -1,12 +1,12 @@ #!/bin/bash if [[ $1 = 'cassandra' ]]; then - # Create default keyspace for single node cluster until cqlsh -f/opt/cassandra/schema.cql; do - echo "cqlsh: Cassandra is unavailable - retring" + echo "cqlsh: Cassandra is unavailable - retrying" sleep 2 done & + fi exec /docker-entrypoint.sh "$@"