diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-11-01 17:34:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-01 17:34:56 +0000 |
| commit | 3149d55b7d2103953eca83595d135f979f710b86 (patch) | |
| tree | cb1541aa4c8d68900e855766d26c6c498512d072 | |
| parent | Merge pull request #4004 from matrix-org/travis/login-terms (diff) | |
| parent | changelog.d entry somehow got lost (diff) | |
| download | synapse-3149d55b7d2103953eca83595d135f979f710b86.tar.xz | |
Merge pull request #3778 from z3ntu/patch-1
Fix build of Docker image with docker-compose
| -rw-r--r-- | changelog.d/3778.misc | 1 | ||||
| -rw-r--r-- | contrib/docker/docker-compose.yml | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/changelog.d/3778.misc b/changelog.d/3778.misc new file mode 100644 index 0000000000..b78a2c9f42 --- /dev/null +++ b/changelog.d/3778.misc @@ -0,0 +1 @@ +Fix build of Docker image with docker-compose diff --git a/contrib/docker/docker-compose.yml b/contrib/docker/docker-compose.yml index b1f6fcb7da..2c1f0671b2 100644 --- a/contrib/docker/docker-compose.yml +++ b/contrib/docker/docker-compose.yml @@ -6,9 +6,11 @@ version: '3' services: synapse: - build: ../.. + build: + context: ../.. + dockerfile: docker/Dockerfile image: docker.io/matrixdotorg/synapse:latest - # Since snyapse does not retry to connect to the database, restart upon + # Since synapse does not retry to connect to the database, restart upon # failure restart: unless-stopped # See the readme for a full documentation of the environment settings |