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

Complement test image: capture logs from nginx #14063

Merged
merged 3 commits into from
Oct 5, 2022
Merged

Complement test image: capture logs from nginx #14063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2633768
Complement test image: capture logs from nginx
richvdh Oct 5, 2022
e600c31
try something else
richvdh Oct 5, 2022
18c25c8
Merge branch 'develop' into rav/nginx_log_to_stdout
richvdh Oct 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/14063.misc
View file
Open in desktop
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
View file
Open in desktop
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