diff options
author | Ashley Nelson <amn@fantashley.com> | 2020-06-20 15:28:30 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-20 21:28:30 +0100 |
commit | 61e0482fef7aa34c0261e41fd90aa5c5e4890bfc (patch) | |
tree | 83ef7ac4a8707bcaf018198367484c877d8069d2 /build | |
parent | 7f26b0cd13534ba235c2bf0a7220d3462ca8e9da (diff) |
Add appservices component to docker scripts (#1153)
Signed-off-by: Ashley Nelson <amn@fantashley.com>
Diffstat (limited to 'build')
-rw-r--r-- | build/docker/config/dendrite-config.yaml | 1 | ||||
-rw-r--r-- | build/docker/docker-compose.polylith.yml | 14 | ||||
-rwxr-xr-x | build/docker/images-build.sh | 1 | ||||
-rwxr-xr-x | build/docker/images-pull.sh | 1 | ||||
-rwxr-xr-x | build/docker/images-push.sh | 1 | ||||
-rwxr-xr-x | build/scripts/build-test-lint.sh | 2 |
6 files changed, 19 insertions, 1 deletions
diff --git a/build/docker/config/dendrite-config.yaml b/build/docker/config/dendrite-config.yaml index f421b2e7..53d9f7b0 100644 --- a/build/docker/config/dendrite-config.yaml +++ b/build/docker/config/dendrite-config.yaml @@ -118,6 +118,7 @@ listen: edu_server: "edu_server:7777" key_server: "key_server:7779" user_api: "user_api:7780" + appservice_api: "appservice_api:7781" # The configuration for tracing the dendrite components. tracing: diff --git a/build/docker/docker-compose.polylith.yml b/build/docker/docker-compose.polylith.yml index af2ae4e8..d424d43b 100644 --- a/build/docker/docker-compose.polylith.yml +++ b/build/docker/docker-compose.polylith.yml @@ -163,6 +163,20 @@ services: networks: - internal + appservice_api: + hostname: appservice_api + image: matrixdotorg/dendrite:appservice + command: [ + "--config=dendrite.yaml" + ] + volumes: + - ./config:/etc/dendrite + networks: + - internal + depends_on: + - room_server + - user_api + networks: internal: attachable: true diff --git a/build/docker/images-build.sh b/build/docker/images-build.sh index e43d2d04..9ee5a09d 100755 --- a/build/docker/images-build.sh +++ b/build/docker/images-build.sh @@ -6,6 +6,7 @@ docker build -f build/docker/Dockerfile -t matrixdotorg/dendrite:latest . docker build -t matrixdotorg/dendrite:monolith --build-arg component=dendrite-monolith-server -f build/docker/Dockerfile.component . +docker build -t matrixdotorg/dendrite:appservice --build-arg component=dendrite-appservice-server -f build/docker/Dockerfile.component . docker build -t matrixdotorg/dendrite:clientapi --build-arg component=dendrite-client-api-server -f build/docker/Dockerfile.component . docker build -t matrixdotorg/dendrite:clientproxy --build-arg component=client-api-proxy -f build/docker/Dockerfile.component . docker build -t matrixdotorg/dendrite:eduserver --build-arg component=dendrite-edu-server -f build/docker/Dockerfile.component . diff --git a/build/docker/images-pull.sh b/build/docker/images-pull.sh index edccf4a3..da08a732 100755 --- a/build/docker/images-pull.sh +++ b/build/docker/images-pull.sh @@ -2,6 +2,7 @@ docker pull matrixdotorg/dendrite:monolith +docker pull matrixdotorg/dendrite:appservice docker pull matrixdotorg/dendrite:clientapi docker pull matrixdotorg/dendrite:clientproxy docker pull matrixdotorg/dendrite:eduserver diff --git a/build/docker/images-push.sh b/build/docker/images-push.sh index 2b430387..d8f8758a 100755 --- a/build/docker/images-push.sh +++ b/build/docker/images-push.sh @@ -2,6 +2,7 @@ docker push matrixdotorg/dendrite:monolith +docker push matrixdotorg/dendrite:appservice docker push matrixdotorg/dendrite:clientapi docker push matrixdotorg/dendrite:clientproxy docker push matrixdotorg/dendrite:eduserver diff --git a/build/scripts/build-test-lint.sh b/build/scripts/build-test-lint.sh index 4b18ca2f..8f0b775b 100755 --- a/build/scripts/build-test-lint.sh +++ b/build/scripts/build-test-lint.sh @@ -10,7 +10,7 @@ set -eu echo "Checking that it builds..." go build ./cmd/... -./scripts/find-lint.sh +./build/scripts/find-lint.sh echo "Testing..." go test -v ./... |