From 337b02372949d74076222c3b29c5380d16dd892e Mon Sep 17 00:00:00 2001
From: Olivier Gimenez <oliv4945@gmail.com>
Date: Sat, 16 Jan 2021 23:18:21 +0100
Subject: [PATCH] docs: Add key generation without go

Signed-off-by: Olivier Gimenez <oliv4945@gmail.com>
---
 build/docker/README.md                   | 28 ++++++++++++++++++++----
 build/docker/docker-compose.monolith.yml |  5 +++--
 build/docker/docker-compose.polylith.yml |  1 +
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/build/docker/README.md b/build/docker/README.md
index 818f92d03..fc3cbe5fc 100644
--- a/build/docker/README.md
+++ b/build/docker/README.md
@@ -34,13 +34,33 @@ runtime config should come from. The mounted folder must contain:
 - `server.crt` certificate file
 - `server.key` private key file for the above certificate
 
-To generate keys:
+**To generate keys:**  
+With Go installed on the host
 
 ```
+mkdir keys
 go run github.com/matrix-org/dendrite/cmd/generate-keys \
-  --private-key=matrix_key.pem \
-  --tls-cert=server.crt \
-  --tls-key=server.key
+  --private-key=keys/matrix_key.pem \
+  --tls-cert=keys/server.crt \
+  --tls-key=keys/server.key
+```
+
+Without Go on the host, with monolith deployment
+
+```
+docker-compose run --entrypoint generate-keys monolith \
+  --private-key=/keys/matrix_key.pem \
+  --tls-cert=/keys/server.crt \
+  --tls-key=/keys/server.key
+```
+
+Without Go on the host, with polylith deployment
+
+```
+docker-compose run --entrypoint generate-keys key_server \
+  --private-key=/keys/matrix_key.pem \
+  --tls-cert=/keys/server.crt \
+  --tls-key=/keys/server.key
 ```
 
 ## Starting Dendrite as a monolith deployment
diff --git a/build/docker/docker-compose.monolith.yml b/build/docker/docker-compose.monolith.yml
index 024183aa6..eab207c28 100644
--- a/build/docker/docker-compose.monolith.yml
+++ b/build/docker/docker-compose.monolith.yml
@@ -4,14 +4,15 @@ services:
     hostname: monolith
     image: matrixdotorg/dendrite-monolith:latest
     command: [
-      "--tls-cert=server.crt",
-      "--tls-key=server.key"
+      "--tls-cert=/keys/server.crt",
+      "--tls-key=/keys/server.key"
     ]
     ports:
       - 8008:8008
       - 8448:8448
     volumes:
       - ./config:/etc/dendrite
+      - ./keys:/keys
     networks:
       - internal
 
diff --git a/build/docker/docker-compose.polylith.yml b/build/docker/docker-compose.polylith.yml
index f377e36fc..37b9a404a 100644
--- a/build/docker/docker-compose.polylith.yml
+++ b/build/docker/docker-compose.polylith.yml
@@ -69,6 +69,7 @@ services:
     command: keyserver
     volumes:
       - ./config:/etc/dendrite
+      - ./keys:/keys
     networks:
         - internal