diff options
| author | Eric Eastwood <erice@element.io> | 2022-11-18 17:05:41 -0600 |
|---|---|---|
| committer | Eric Eastwood <erice@element.io> | 2022-11-18 17:05:41 -0600 |
| commit | 04de9ea73809670f4ce2cf0dc085065a324453e8 (patch) | |
| tree | 95cb00be91df21d3002651b0835eca8ea88645e5 /docker/Dockerfile-workers | |
| parent | Merge branch 'madlittlemods/11850-migrate-to-opentelemetry' into madlittlemod... (diff) | |
| parent | Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry (diff) | |
| download | synapse-github/madlittlemods/13356-messages-investigation-scratch-v1.tar.xz | |
Merge branch 'madlittlemods/11850-migrate-to-opentelemetry' into madlittlemods/13356-messages-investigation-scratch-v1 github/madlittlemods/13356-messages-investigation-scratch-v1 madlittlemods/13356-messages-investigation-scratch-v1
Conflicts: synapse/handlers/federation.py synapse/handlers/relations.py
Diffstat (limited to 'docker/Dockerfile-workers')
| -rw-r--r-- | docker/Dockerfile-workers | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docker/Dockerfile-workers b/docker/Dockerfile-workers index 003a1cc3bf..0c2d4f3047 100644 --- a/docker/Dockerfile-workers +++ b/docker/Dockerfile-workers @@ -40,7 +40,11 @@ FROM matrixdotorg/synapse:$SYNAPSE_VERSION COPY --from=deps_base /etc/nginx /etc/nginx RUN rm /etc/nginx/sites-enabled/default RUN mkdir /var/log/nginx /var/lib/nginx - RUN chown www-data /var/log/nginx /var/lib/nginx + RUN chown www-data /var/lib/nginx + + # have nginx log to stderr/out + RUN ln -sf /dev/stdout /var/log/nginx/access.log + RUN ln -sf /dev/stderr /var/log/nginx/error.log # Copy Synapse worker, nginx and supervisord configuration template files COPY ./docker/conf-workers/* /conf/ |