From 76072b7c87c51a15482e82b9060513d5fb16f191 Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Mon, 13 Jan 2020 23:44:51 +0100
Subject: [PATCH] Add Scylla + matrix update

---
 docker/matrix-synapse/Dockerfile |  2 +-
 docker/matrix-synapse/README.md  |  2 +-
 nomad/chat.hcl                   |  4 +-
 nomad/persistence.hcl            | 79 ++++++++++++++++++++++++++++++++
 4 files changed, 83 insertions(+), 4 deletions(-)
 create mode 100644 nomad/persistence.hcl

diff --git a/docker/matrix-synapse/Dockerfile b/docker/matrix-synapse/Dockerfile
index 140304d..7b7d4a5 100644
--- a/docker/matrix-synapse/Dockerfile
+++ b/docker/matrix-synapse/Dockerfile
@@ -1,6 +1,6 @@
 FROM amd64/debian:stretch as builder
 
-ENV VERSION 1.7.0rc1
+ENV VERSION 1.8.0
 
 RUN apt-get update && \
     apt-get -qq -y full-upgrade && \
diff --git a/docker/matrix-synapse/README.md b/docker/matrix-synapse/README.md
index 2aed6cf..832ef53 100644
--- a/docker/matrix-synapse/README.md
+++ b/docker/matrix-synapse/README.md
@@ -1,3 +1,3 @@
 ```
-docker build -t superboum/amd64_synapse:v23 .
+docker build -t superboum/amd64_synapse:v24 .
 ```
diff --git a/nomad/chat.hcl b/nomad/chat.hcl
index 09b6946..1e9a0bf 100644
--- a/nomad/chat.hcl
+++ b/nomad/chat.hcl
@@ -8,7 +8,7 @@ job "chat" {
       driver = "docker"
 
       config {
-        image = "superboum/amd64_synapse:v23"
+        image = "superboum/amd64_synapse:v24"
         readonly_rootfs = true
         port_map {
           client_port = 8008
@@ -184,7 +184,7 @@ job "chat" {
     task "server" {
       driver = "docker"
       config {
-        image = "superboum/amd64_riotweb:v7"
+        image = "superboum/amd64_riotweb:v8"
         port_map {
           web_port = 8043
         }
diff --git a/nomad/persistence.hcl b/nomad/persistence.hcl
new file mode 100644
index 0000000..56f2a8c
--- /dev/null
+++ b/nomad/persistence.hcl
@@ -0,0 +1,79 @@
+job "persistence" {
+  datacenters = ["dc1"]
+  type = "service"
+
+  constraint {
+    attribute = "${attr.cpu.arch}"
+    value     = "amd64"
+  }
+
+  group "scylladb" {
+    count = 3
+
+    constraint {
+      operator  = "distinct_hosts"
+      value     = "true"
+    }
+
+    // volume + command line
+    task "scylladb_worker" {
+      driver = "docker"
+      config {
+        image = "scylladb/scylla:3.1.2"
+        readonly_rootfs = false
+        port_map {
+          scylla_port = 9042
+          scylla_gossip_port = 7000
+          scylla_jmx_port = 7199
+        }
+        args = [
+          "--seeds=192.168.1.2,192.168.1.3,192.168.1.4",
+          "--listen-address=0.0.0.0",
+          "--broadcast-address=${NOMAD_IP_scylla_port}",
+          "--broadcast-rpc-address=${NOMAD_IP_scylla_port}",
+          "--developer-mode", "1",
+          "--overprovisioned", "1",
+          "--experimental", "0",
+          "--memory", "200M"
+        ]
+	volumes = [
+          "/var/lib/scylla:/var/lib/scylla"
+        ]
+      }
+
+      resources {
+        memory = 500
+        network {
+          port "scylla_port" {
+            static = "9042"
+          }
+          port "scylla_gossip_port" {
+            static = "7000"
+          }
+          port "scylla_jmx_port" {
+            static = "7199"
+          }
+        }
+      }
+
+      service {
+        tags = ["scylla"]
+        port = "scylla_port"
+        address_mode = "host"
+        name = "scylla"
+        check {
+          type = "tcp"
+          port = "scylla_port"
+          interval = "60s"
+          timeout = "5s"
+          check_restart {
+            limit = 3
+            grace = "90s"
+            ignore_warnings = false
+          }
+        }
+      }
+    }
+  }
+}
+