diff --git a/Dockerfile b/Dockerfile index d2ce1a5..1b93d70 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,10 @@ -FROM luketillman/datastax-enterprise:5.1.0 +FROM store/datastax/dse-server:5.1.4 # Copy schema files into /opt/killrvideo-data COPY [ "lib/killrvideo-data/graph/killrvideo_video_recommendations_schema.groovy", "lib/killrvideo-data/schema.cql", "lib/killrvideo-data/search/*.xml", "keyspace.cql", "/opt/killrvideo-data/" ] -# Copy bootstrap script(s) and make executable +# Copy bootstrap script(s) COPY [ "bootstrap-external-cluster.sh", "lib/wait-for-it/wait-for-it.sh", "/" ] -RUN chmod +x /bootstrap-external-cluster.sh /wait-for-it.sh # Set the entrypoint to the bootstrap script ENTRYPOINT [ "/bootstrap-external-cluster.sh" ] diff --git a/bootstrap-external-cluster.sh b/bootstrap-external-cluster.sh old mode 100644 new mode 100755 index 859cc37..86e986f --- a/bootstrap-external-cluster.sh +++ b/bootstrap-external-cluster.sh @@ -28,7 +28,7 @@ echo '=> Spoofing DSE Graph in ETCD' curl http://$KILLRVIDEO_DOCKER_IP:2379/v2/keys/killrvideo/services/$SERVICE_8182_NAME/external_cluster -XPUT -d value="$EXTERNAL_CLUSTER_IP:8182" # See if we've already completed bootstrapping - if [ ! -f /killrvideo_bootstrapped ]; then + if [ ! -f killrvideo_bootstrapped ]; then echo 'Setting up KillrVideo on EXTERNAL cluster' # Wait for port 9042 (CQL) to be ready for up to 120 seconds @@ -78,7 +78,7 @@ curl http://$KILLRVIDEO_DOCKER_IP:2379/v2/keys/killrvideo/services/$SERVICE_8182 dse gremlin-console -e /opt/killrvideo-data/killrvideo_video_recommendations_schema.groovy # Don't bootstrap next time we start - touch /killrvideo_bootstrapped + touch killrvideo_bootstrapped # Now allow DSE to start normally below echo 'KillrVideo has been setup, EXTERNAL DSE cluster ready to go' diff --git a/build/VERSION b/build/VERSION index 1ab9918..62ce70f 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -DOCKER_BUILD_TAG=3.0.0 +DOCKER_BUILD_TAG=4.0.0