From b739c720429a17991a581df9b3a8f59248a5f3b0 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Thu, 21 May 2020 15:27:42 +0100 Subject: [PATCH] Update Docker Hub for server key API --- build/docker/hub/config/dendrite-config.yaml | 6 +++-- build/docker/hub/docker-compose.polylith.yml | 13 +++++++++- build/docker/hub/images-build.sh | 25 ++++++++++---------- 3 files changed, 29 insertions(+), 15 deletions(-) diff --git a/build/docker/hub/config/dendrite-config.yaml b/build/docker/hub/config/dendrite-config.yaml index 23d6479b5..87dcdfe38 100644 --- a/build/docker/hub/config/dendrite-config.yaml +++ b/build/docker/hub/config/dendrite-config.yaml @@ -109,12 +109,14 @@ database: listen: room_server: "room_server:7770" client_api: "client_api:7771" - federation_api: "federation_api:7772" + federation_api: "federation_api:7772" + server_key_api: "server_key_api:7778" sync_api: "sync_api:7773" media_api: "media_api:7774" public_rooms_api: "public_rooms_api:7775" federation_sender: "federation_sender:7776" - edu_server: "edu_server:7777" + edu_server: "edu_server:7777" + key_server: "key_server:7779" # The configuration for tracing the dendrite components. tracing: diff --git a/build/docker/hub/docker-compose.polylith.yml b/build/docker/hub/docker-compose.polylith.yml index f39670788..4be6e7129 100644 --- a/build/docker/hub/docker-compose.polylith.yml +++ b/build/docker/hub/docker-compose.polylith.yml @@ -131,7 +131,7 @@ services: - internal key_server: - hostname: key_serverde + hostname: key_server image: matrixdotorg/dendrite:keyserver command: [ "--config=dendrite.yaml" @@ -141,6 +141,17 @@ services: networks: - internal + server_key_api: + hostname: server_key_api + image: matrixdotorg/dendrite:serverkeyapi + command: [ + "--config=dendrite.yaml" + ] + volumes: + - ./config:/etc/dendrite + networks: + - internal + networks: internal: attachable: true diff --git a/build/docker/hub/images-build.sh b/build/docker/hub/images-build.sh index 0c6a0eb7a..b162a0639 100755 --- a/build/docker/hub/images-build.sh +++ b/build/docker/hub/images-build.sh @@ -2,16 +2,17 @@ cd $(git rev-parse --show-toplevel) -docker build -f docker/hub/Dockerfile -t matrixdotorg/dendrite:latest . +docker build -f build/docker/hub/Dockerfile -t matrixdotorg/dendrite:latest . -docker build -t matrixdotorg/dendrite:clientapi --build-arg component=dendrite-client-api-server -f docker/hub/Dockerfile.component . -docker build -t matrixdotorg/dendrite:clientproxy --build-arg component=client-api-proxy -f docker/hub/Dockerfile.component . -docker build -t matrixdotorg/dendrite:eduserver --build-arg component=dendrite-edu-server -f docker/hub/Dockerfile.component . -docker build -t matrixdotorg/dendrite:federationapi --build-arg component=dendrite-federation-api-server -f docker/hub/Dockerfile.component . -docker build -t matrixdotorg/dendrite:federationsender --build-arg component=dendrite-federation-sender-server -f docker/hub/Dockerfile.component . -docker build -t matrixdotorg/dendrite:federationproxy --build-arg component=federation-api-proxy -f docker/hub/Dockerfile.component . -docker build -t matrixdotorg/dendrite:keyserver --build-arg component=dendrite-key-server -f docker/hub/Dockerfile.component . -docker build -t matrixdotorg/dendrite:mediaapi --build-arg component=dendrite-media-api-server -f docker/hub/Dockerfile.component . -docker build -t matrixdotorg/dendrite:publicroomsapi --build-arg component=dendrite-public-rooms-api-server -f docker/hub/Dockerfile.component . -docker build -t matrixdotorg/dendrite:roomserver --build-arg component=dendrite-room-server -f docker/hub/Dockerfile.component . -docker build -t matrixdotorg/dendrite:syncapi --build-arg component=dendrite-sync-api-server -f docker/hub/Dockerfile.component . +docker build -t matrixdotorg/dendrite:clientapi --build-arg component=dendrite-client-api-server -f build/docker/hub/Dockerfile.component . +docker build -t matrixdotorg/dendrite:clientproxy --build-arg component=client-api-proxy -f build/docker/hub/Dockerfile.component . +docker build -t matrixdotorg/dendrite:eduserver --build-arg component=dendrite-edu-server -f build/docker/hub/Dockerfile.component . +docker build -t matrixdotorg/dendrite:federationapi --build-arg component=dendrite-federation-api-server -f build/docker/hub/Dockerfile.component . +docker build -t matrixdotorg/dendrite:federationsender --build-arg component=dendrite-federation-sender-server -f build/docker/hub/Dockerfile.component . +docker build -t matrixdotorg/dendrite:federationproxy --build-arg component=federation-api-proxy -f build/docker/hub/Dockerfile.component . +docker build -t matrixdotorg/dendrite:keyserver --build-arg component=dendrite-key-server -f build/docker/hub/Dockerfile.component . +docker build -t matrixdotorg/dendrite:mediaapi --build-arg component=dendrite-media-api-server -f build/docker/hub/Dockerfile.component . +docker build -t matrixdotorg/dendrite:publicroomsapi --build-arg component=dendrite-public-rooms-api-server -f build/docker/hub/Dockerfile.component . +docker build -t matrixdotorg/dendrite:roomserver --build-arg component=dendrite-room-server -f build/docker/hub/Dockerfile.component . +docker build -t matrixdotorg/dendrite:syncapi --build-arg component=dendrite-sync-api-server -f build/docker/hub/Dockerfile.component . +docker build -t matrixdotorg/dendrite:serverkeyapi --build-arg component=dendrite-server-key-api-server -f build/docker/hub/Dockerfile.component .