From 386cc975f08b44cd8f83e6d2fbcb08ee55fdb868 Mon Sep 17 00:00:00 2001
From: Victor Cuadrado Juan <viccuad@users.noreply.github.com>
Date: Fri, 9 Aug 2019 12:30:38 +0200
Subject: [PATCH] Add typingserver service to docker-compose (#692)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Víctor Cuadrado Juan <me@viccuad.me>
---
 docker/README.md                 |  2 +-
 docker/dendrite-docker.yml       |  1 +
 docker/docker-compose.yml        | 10 ++++++++++
 docker/services/typing-server.sh |  5 +++++
 4 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 docker/services/typing-server.sh

diff --git a/docker/README.md b/docker/README.md
index 7d18ce605..ff88c0818 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -58,7 +58,7 @@ docker-compose up kafka zookeeper postgres
 and the following dendrite components 
 
 ```
-docker-compose up client_api media_api sync_api room_server public_rooms_api
+docker-compose up client_api media_api sync_api room_server public_rooms_api typing_server
 docker-compose up client_api_proxy
 ```
 
diff --git a/docker/dendrite-docker.yml b/docker/dendrite-docker.yml
index c2e7682eb..abb8c3307 100644
--- a/docker/dendrite-docker.yml
+++ b/docker/dendrite-docker.yml
@@ -114,6 +114,7 @@ listen:
     media_api: "media_api:7774"
     public_rooms_api: "public_rooms_api:7775"
     federation_sender: "federation_sender:7776"
+    typing_server: "typing_server:7777"
 
 # The configuration for tracing the dendrite components.
 tracing:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 763e5b0f0..9cf67457c 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -95,6 +95,16 @@ services:
     networks:
       - internal
 
+  typing_server:
+    container_name: dendrite_typing_server
+    hostname: typing_server
+    entrypoint: ["bash", "./docker/services/typing-server.sh"]
+    build: ./
+    volumes:
+      - ..:/build
+    networks:
+      - internal
+
   federation_api_proxy:
     container_name: dendrite_federation_api_proxy
     hostname: federation_api_proxy
diff --git a/docker/services/typing-server.sh b/docker/services/typing-server.sh
new file mode 100644
index 000000000..16ee0fa62
--- /dev/null
+++ b/docker/services/typing-server.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+bash ./docker/build.sh
+
+./bin/dendrite-typing-server --config=dendrite.yaml