summary refs log tree commit diff
path: root/docker/Dockerfile-workers
diff options
context:
space:
mode:
authorreivilibre <oliverw@matrix.org>2022-04-27 14:39:41 +0100
committerGitHub <noreply@github.com>2022-04-27 14:39:41 +0100
commitd743b25c8f0c96516d9c374ee946e93e937e2c5b (patch)
tree37ab35448d2e3ebd6a1734cc1f53afc9d1df40b6 /docker/Dockerfile-workers
parentMake `scripts-dev` pass `mypy --disallow-untyped-defs` (#12356) (diff)
downloadsynapse-d743b25c8f0c96516d9c374ee946e93e937e2c5b.tar.xz
Use supervisord to supervise Postgres and Caddy in the Complement image. (#12480)
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Diffstat (limited to 'docker/Dockerfile-workers')
-rw-r--r--docker/Dockerfile-workers3
1 files changed, 3 insertions, 0 deletions
diff --git a/docker/Dockerfile-workers b/docker/Dockerfile-workers
index 9ccb2b22a7..24b03585f9 100644
--- a/docker/Dockerfile-workers
+++ b/docker/Dockerfile-workers
@@ -20,6 +20,9 @@ RUN rm /etc/nginx/sites-enabled/default
 # Copy Synapse worker, nginx and supervisord configuration template files
 COPY ./docker/conf-workers/* /conf/
 
+# Copy a script to prefix log lines with the supervisor program name
+COPY ./docker/prefix-log /usr/local/bin/
+
 # Expose nginx listener port
 EXPOSE 8080/tcp