Merge branch 'infra/cassandra-upgrade-26' into 'master'

(infra): updating local Cassandra to 4.0.7 minds/infrastructure/infrastructure#26

See merge request minds/minds!210

containers/cassandra/Dockerfile

@@ -0,0 +1,3 @@
+FROM cassandra:4.0.7
+
+COPY cassandra.yaml /etc/cassandra/cassandra.yaml

containers/wait-for-cassandra/Dockerfile

@@ -0,0 +1,6 @@
+FROM cassandra:4.0.7
+
+WORKDIR /opt
+COPY wait-for-cassandra.sh /opt/
+
+ENTRYPOINT ["sh", "./wait-for-cassandra.sh"]

containers/wait-for-cassandra/wait-for-cassandra.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# Exit script wit ERRORLEVEL if any command fails
+set -e
+
+echo "Waiting for Cassandra to come online..."
+until cqlsh cassandra -e "show version"
+do
+    echo "Ping..."
+    sleep 1
+done
+
+echo "Cassandra is up and running"

docker-compose.yml

@@ -79,7 +79,8 @@ services:
   ## DATABASES
 
   cassandra:
-    image: cassandra:3.11.1
+    build:
+      context: ./containers/cassandra
     environment:
       - CASSANDRA_START_RPC=true
       - MAX_HEAP_SIZE=768M
@@ -95,6 +96,14 @@ services:
       timeout: 5s
       interval: 15s
 
+  wait-for-cassandra:
+    build:
+      context: ./containers/wait-for-cassandra
+    networks:
+      - app
+    depends_on:
+      - cassandra
+
   elasticsearch:
     image: amazon/opendistro-for-elasticsearch:1.13.2
     mem_limit: 1G # keep an eye

local/commands/install.js

@@ -48,6 +48,7 @@ module.exports.handler = async argv => {
     argv.stack && require('../tasks/cleanup-stack'),
     argv.stack && require('../tasks/provision-elasticsearch'),
     argv.stack && require('../tasks/provision-mysql'),
+    argv.stack && require('../tasks/wait-for-cassandra'),
     argv.stack && require('../tasks/install-minds'),
     require('../tasks/restart'),
   ].filter(Boolean), {

local/tasks/wait-for-cassandra.js

@@ -0,0 +1,12 @@
+const Listr = require('listr');
+const doco = require('../lib/doco');
+
+module.exports = {
+  title: 'Start Cassandra',
+  task: () => new Listr([
+    {
+      title: 'Waiting for Cassandra',
+      task: () => doco('run', 'wait-for-cassandra')
+    },
+  ])
+};