From 137bc404786fa42a89beecbb899c6063a413dd17 Mon Sep 17 00:00:00 2001
From: Mark Harding <mark@minds.com>
Date: Fri, 26 Jan 2024 10:17:47 +0000
Subject: [PATCH] Add vault and php-rr to docker compose

---
 docker-compose.yml | 51 +++++++++++++++++++++++++++++++++++++---------
 1 file changed, 41 insertions(+), 10 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 4605b19de..01c9f5e11 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,6 +13,7 @@ services:
     mem_limit: 512MB
     depends_on:
       - php-fpm
+      - php-rr
     networks:
       - app
     ports:
@@ -21,6 +22,7 @@ services:
       - UPSTREAM_ENDPOINT
     volumes:
       - ./front/:/var/www/Minds/front:cached
+      - ./embedded-comments/:/var/www/Minds/embedded-comments
 
   ## APP ENGINE
 
@@ -32,7 +34,6 @@ services:
     depends_on:
       - cassandra
       - elasticsearch
-      - rabbitmq
       - redis
       - pulsar
       - mysql
@@ -43,6 +44,26 @@ services:
       - ./engine/:/var/www/Minds/engine:cached
       - keys:/.dev
 
+  php-rr:
+    build:
+      context: ./engine
+      dockerfile: ./containers/php-rr/Dockerfile.dev
+    mem_limit: 512MB
+    depends_on:
+      - cassandra
+      - elasticsearch
+      - redis
+      - pulsar
+      - mysql
+    networks:
+      - app
+    ports:
+      - "9001:9001"
+      - "2112:2112"
+    volumes:
+      - ./engine/:/var/www/Minds/engine:cached
+      - keys:/.dev
+
   runners:
     build:
       context: ./engine
@@ -50,7 +71,6 @@ services:
     depends_on:
       - cassandra
       - elasticsearch
-      - rabbitmq
       - redis
     networks:
       - app
@@ -76,6 +96,23 @@ services:
     ports:
       - 8010:3030
 
+  ## Vault
+
+  vault:
+    image: hashicorp/vault
+    networks:
+      - app
+    environment:
+      VAULT_ADDR: "http://0.0.0.0:8200"
+      VAULT_API_ADDR: "http://0.0.0.0:8200"
+    cap_add:
+      - IPC_LOCK
+    ports:
+      - 8200:8200
+    volumes:
+      - vault:/vault/file:rw
+    entrypoint: vault server -dev -dev-listen-address="0.0.0.0:8200" -dev-root-token-id="root"
+
   ## DATABASES
 
   cassandra:
@@ -140,13 +177,6 @@ services:
     ports:
       - "6379:6379"
 
-  ## QUEUE
-
-  rabbitmq:
-    image: rabbitmq:3.6-alpine
-    networks:
-      - app
-
   ## INSTALLATION ARTIFACTS
 
   installer:
@@ -174,7 +204,7 @@ services:
   ## Pulsar
 
   pulsar:
-    image: apachepulsar/pulsar:2.7.1
+    image: apachepulsar/pulsar:2.11.2
     entrypoint: bin/pulsar standalone -nss
     networks:
       - app
@@ -240,6 +270,7 @@ volumes:
   pulsardata:
   pulsarconf:
   mysql:
+  vault:
 
 networks:
   app: