mirror of
https://git.anonymousland.org/anonymousland/synapse-worker-docker.git
synced 2024-10-01 11:49:56 -04:00
Relocate Nginx RUN
This commit is contained in:
parent
1a6c426720
commit
0030bc23cb
@ -50,17 +50,10 @@ RUN apk -U upgrade \
|
|||||||
### Worker Build Configuration
|
### Worker Build Configuration
|
||||||
FROM python:alpine as worker_build
|
FROM python:alpine as worker_build
|
||||||
|
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache/pip \
|
RUN --mount=type=cache,target=/root/.cache/pip \
|
||||||
pip install supervisor~=4.2
|
pip install supervisor~=4.2
|
||||||
RUN mkdir -p /etc/supervisor/conf.d
|
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
|
### Build Production
|
||||||
|
|
||||||
FROM python:alpine
|
FROM python:alpine
|
||||||
@ -88,6 +81,12 @@ RUN apk -U upgrade \
|
|||||||
RUN pip install --upgrade pip \
|
RUN pip install --upgrade pip \
|
||||||
&& pip install -e "git+https://github.com/matrix-org/mjolnir.git#egg=mjolnir&subdirectory=synapse_antispam"
|
&& 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=build-malloc /tmp/hardened_malloc/out/libhardened_malloc.so /usr/local/lib/
|
||||||
COPY --from=builder /install /usr/local
|
COPY --from=builder /install /usr/local
|
||||||
COPY --chown=synapse:synapse rootfs /
|
COPY --chown=synapse:synapse rootfs /
|
||||||
|
Loading…
Reference in New Issue
Block a user