Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
Complement test image: capture logs from nginx (#14063)
Browse files Browse the repository at this point in the history
Have nginx send its logs to stderr/out, so that we can debug
#13334.
  • Loading branch information
richvdh authored Oct 5, 2022
1 parent 0b037d6 commit 51436c8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
1 change: 1 addition & 0 deletions changelog.d/14063.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Complement test image: capture logs from nginx.
6 changes: 5 additions & 1 deletion docker/Dockerfile-workers
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down

0 comments on commit 51436c8

Please sign in to comment.