diff --git a/Worker.dockerfile b/Worker.dockerfile index c674e32..d8a32e4 100644 --- a/Worker.dockerfile +++ b/Worker.dockerfile @@ -50,17 +50,10 @@ RUN apk -U upgrade \ ### Worker Build Configuration FROM python:alpine as worker_build - RUN --mount=type=cache,target=/root/.cache/pip \ pip install supervisor~=4.2 RUN mkdir -p /etc/supervisor/conf.d - RUN rm /etc/nginx/sites-enabled/default - RUN mkdir /var/log/nginx /var/lib/nginx - RUN chown www-data /var/lib/nginx - RUN ln -sf /dev/stdout /var/log/nginx/access.log - RUN ln -sf /dev/stderr /var/log/nginx/error.log - ### Build Production FROM python:alpine @@ -88,6 +81,12 @@ RUN apk -U upgrade \ RUN pip install --upgrade pip \ && pip install -e "git+https://github.com/matrix-org/mjolnir.git#egg=mjolnir&subdirectory=synapse_antispam" +RUN rm /etc/nginx/sites-enabled/default +RUN mkdir /var/log/nginx /var/lib/nginx +RUN chown www-data /var/lib/nginx +RUN ln -sf /dev/stdout /var/log/nginx/access.log +RUN ln -sf /dev/stderr /var/log/nginx/error.log + COPY --from=build-malloc /tmp/hardened_malloc/out/libhardened_malloc.so /usr/local/lib/ COPY --from=builder /install /usr/local COPY --chown=synapse:synapse rootfs /