diff --git a/Dockerfile b/Dockerfile index ec0de3d9..a2c2b239 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:labs FROM --platform="$BUILDPLATFORM" alpine:3.19.1 as frontend COPY frontend /build/frontend COPY global/certbot-dns-plugins.json /build/frontend/certbot-dns-plugins.json @@ -55,7 +56,7 @@ RUN apk upgrade --no-cache -a && \ echo "#APPSEC_FAILURE_ACTION=deny # see https://github.com/crowdsecurity/lua-cs-bouncer/issues/63" | tee -a /src/crowdsec-nginx-bouncer/lua-mod/config_example.conf && \ sed -i "s|BOUNCING_ON_TYPE=all|BOUNCING_ON_TYPE=ban|g" /src/crowdsec-nginx-bouncer/lua-mod/config_example.conf -FROM zoeyvid/nginx-quic:258 +FROM zoeyvid/nginx-quic:259 SHELL ["/bin/ash", "-eo", "pipefail", "-c"] ARG CRS_VER=v4.0/dev diff --git a/README.md b/README.md index 9cd84d93..734f611e 100644 --- a/README.md +++ b/README.md @@ -91,10 +91,6 @@ so that the barrier for entry here is low. - See the composefile for all available options - If you want to redirect all HTTP traffic to HTTPS, you can use the `compose.override.yaml` file. -## Soon -- maybe redis and/or sql databases built in -- more - ## migration - **NOTE: migrating back to the original is not possible**, so make first a **backup** before migration, so you can use the backup to switch back - if you use custom certificates, you need to upload the CA/Intermediate Certificate (file name: `chain.pem`) in the `/opt/npm/tls/custom/npm-[certificate-id]` folder diff --git a/rootfs/usr/local/nginx/conf/nginx.conf b/rootfs/usr/local/nginx/conf/nginx.conf index 97800f07..9bcaa9cd 100644 --- a/rootfs/usr/local/nginx/conf/nginx.conf +++ b/rootfs/usr/local/nginx/conf/nginx.conf @@ -9,8 +9,6 @@ worker_cpu_affinity auto; include /data/nginx/custom/root.conf; events { - use epoll; - # Custom include /data/nginx/custom/events.conf; }