From 20b4ef6baf2629d7117693c54afaf65338fe3410 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Tue, 20 Oct 2020 15:22:40 +0100
Subject: [PATCH] Postgres 9.6 or later, fix some more Docker stuff

---
 build/docker/Dockerfile.monolith         | 5 ++---
 build/docker/Dockerfile.polylith         | 5 ++---
 build/docker/docker-compose.deps.yml     | 2 +-
 build/docker/docker-compose.polylith.yml | 6 +-----
 docs/INSTALL.md                          | 4 ++--
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/build/docker/Dockerfile.monolith b/build/docker/Dockerfile.monolith
index c2b87839f..3e9d0cba4 100644
--- a/build/docker/Dockerfile.monolith
+++ b/build/docker/Dockerfile.monolith
@@ -2,13 +2,12 @@ FROM matrixdotorg/dendrite:latest AS base
 
 FROM alpine:latest
 
-ARG component=monolith
-
 COPY --from=base /build/bin/dendrite-monolith-server /usr/bin
 COPY --from=base /build/bin/goose /usr/bin
 COPY --from=base /build/bin/create-account /usr/bin
+COPY --from=base /build/bin/generate-keys /usr/bin
 
 VOLUME /etc/dendrite
 WORKDIR /etc/dendrite
 
-ENTRYPOINT /usr/bin/dendrite-monolith-server $@
\ No newline at end of file
+ENTRYPOINT ["/usr/bin/dendrite-monolith-server"]
\ No newline at end of file
diff --git a/build/docker/Dockerfile.polylith b/build/docker/Dockerfile.polylith
index d6676e0da..dd4cbd38f 100644
--- a/build/docker/Dockerfile.polylith
+++ b/build/docker/Dockerfile.polylith
@@ -2,13 +2,12 @@ FROM matrixdotorg/dendrite:latest AS base
 
 FROM alpine:latest
 
-ARG component
-
 COPY --from=base /build/bin/dendrite-polylith-multi /usr/bin
 COPY --from=base /build/bin/goose /usr/bin
 COPY --from=base /build/bin/create-account /usr/bin
+COPY --from=base /build/bin/generate-keys /usr/bin
 
 VOLUME /etc/dendrite
 WORKDIR /etc/dendrite
 
-ENTRYPOINT /usr/bin/dendrite-polylith-multi $@
\ No newline at end of file
+ENTRYPOINT ["/usr/bin/dendrite-polylith-multi"]
\ No newline at end of file
diff --git a/build/docker/docker-compose.deps.yml b/build/docker/docker-compose.deps.yml
index 74e478a8d..1a27ffac0 100644
--- a/build/docker/docker-compose.deps.yml
+++ b/build/docker/docker-compose.deps.yml
@@ -2,7 +2,7 @@ version: "3.4"
 services:
   postgres:
     hostname: postgres
-    image: postgres:9.5
+    image: postgres:9.6
     restart: always
     volumes:
       - ./postgres/create_db.sh:/docker-entrypoint-initdb.d/20-create_db.sh
diff --git a/build/docker/docker-compose.polylith.yml b/build/docker/docker-compose.polylith.yml
index 677dbbfe3..f377e36fc 100644
--- a/build/docker/docker-compose.polylith.yml
+++ b/build/docker/docker-compose.polylith.yml
@@ -6,7 +6,6 @@ services:
     command: clientapi
     volumes:
       - ./config:/etc/dendrite
-      - room_server
     networks:
       - internal
 
@@ -94,10 +93,7 @@ services:
   appservice_api:
     hostname: appservice_api
     image: matrixdotorg/dendrite-polylith:latest
-    command: [
-      "appservice",
-      "--config=dendrite.yaml"
-    ]
+    command: appservice
     volumes:
       - ./config:/etc/dendrite
     networks:
diff --git a/docs/INSTALL.md b/docs/INSTALL.md
index e25ced1c6..f804193cd 100644
--- a/docs/INSTALL.md
+++ b/docs/INSTALL.md
@@ -24,7 +24,7 @@ use in production environments just yet!
 Dendrite requires:
 
 * Go 1.13 or higher
-* Postgres 9.5 or higher (if using Postgres databases, not needed for SQLite)
+* Postgres 9.6 or higher (if using Postgres databases, not needed for SQLite)
 
 If you want to run a polylith deployment, you also need:
 
@@ -98,7 +98,7 @@ create them automatically at startup.
 
 ### Postgres database setup
 
-Assuming that Postgres 9.5 (or later) is installed:
+Assuming that Postgres 9.6 (or later) is installed:
 
 * Create role, choosing a new password when prompted: