mirror of
https://github.com/nextcloud/all-in-one.git
synced 2026-05-21 10:50:10 +00:00
49a24272f6
- nextcloud.conf: increase BrotliCompressionQuality from 0 to 4 - nextcloud.conf: add mod_deflate fallback for non-Brotli clients - nextcloud.conf: enable HTTP/2 cleartext (h2c) via mod_http2 IfModule block - nextcloud.conf: remove Options Indexes and duplicate Options line - nextcloud.conf: remove deprecated Satisfy Any directive - nextcloud.conf: add KeepAlive On / KeepAliveTimeout 5 / MaxKeepAliveRequests 100 - nextcloud.conf: add EnableSendfile On / EnableMMAP Off - Dockerfile: enable mod_http2 LoadModule via sed - Dockerfile: tune mpm_event (MaxRequestWorkers 400, ServerLimit 16, ThreadsPerChild 25, StartServers 2, MinSpareThreads 25, MaxSpareThreads 75) - Caddyfile: add encode gzip zstd for response compression - supervisord.conf: remove duplicate nodaemon=true Agent-Logs-Url: https://github.com/nextcloud/all-in-one/sessions/a79198ed-cd31-4e15-9074-b3d3f3f92069 fix(apache): disable HTTP/2, disable Caddy gzip, restore MaxRequestWorkers 5000 - Caddyfile: remove `encode gzip zstd` (disable gzip/zstd compression in Caddy) - nextcloud.conf: remove HTTP/2 `<IfModule mod_http2.c>` block (disable h2c in Apache) - Dockerfile: remove mod_http2.so LoadModule sed line - Dockerfile: restore MaxRequestWorkers 5000, ServerLimit 200, and original comments Kept from previous commit: - BrotliCompressionQuality raised from 0 to 4 - mod_deflate fallback for non-Brotli clients - KeepAlive On / KeepAliveTimeout 5 / MaxKeepAliveRequests 100 - EnableSendfile On / EnableMMAP Off - ThreadsPerChild 25, StartServers 2, MinSpareThreads 25, MaxSpareThreads 75 - supervisord.conf: remove duplicate nodaemon=true Agent-Logs-Url: https://github.com/nextcloud/all-in-one/sessions/66a07d0e-2276-4b0e-b17d-53c733530d07 fix(apache): prevent double-encoding, add explanatory comments - Add SetEnvIfNoCase Accept-Encoding \bbr\b no-gzip inside mod_brotli block so mod_deflate is skipped for clients that already get Brotli-compressed responses, preventing double-encoding. - Expand all comments to explain the purpose/benefit of each added directive. Agent-Logs-Url: https://github.com/nextcloud/all-in-one/sessions/98098727-e2c1-4504-b0d5-47c8b06b794d docs(apache/Dockerfile): add explanatory comments to all new directives - Add comment block before the sed/LoadModule block explaining why mpm_event is chosen and why mod_brotli is enabled alongside the deflate fallback. - Add per-line comments for ThreadsPerChild, StartServers, MinSpareThreads, and MaxSpareThreads explaining the rationale for each value. Agent-Logs-Url: https://github.com/nextcloud/all-in-one/sessions/2dc7afc9-b8a1-4b0a-ba13-0ad89e5c2d37 fix(apache): disable EnableSendfile to allow output filters (Brotli/deflate) on static files Agent-Logs-Url: https://github.com/nextcloud/all-in-one/sessions/54995b4a-7b5d-4e8e-a92a-684d32b42bd4 docs(apache/nextcloud.conf): add per-directive comments to KeepAlive block Agent-Logs-Url: https://github.com/nextcloud/all-in-one/sessions/329da0e6-b5dd-4cdd-8c05-9ae0bf25ebfd reduce MaxSpareThreads from 75 to 50 Agent-Logs-Url: https://github.com/nextcloud/all-in-one/sessions/f253e0c7-a192-4bda-96c2-c12a7e1cb81b raise MaxKeepAliveRequests from 100 to 500 for Nextcloud sync clients Agent-Logs-Url: https://github.com/nextcloud/all-in-one/sessions/89da74d6-b0d3-4d19-909d-dee06cbad060 remove deflate fallback — all Nextcloud-supported browsers have Brotli Agent-Logs-Url: https://github.com/nextcloud/all-in-one/sessions/def9ae64-6793-4c8f-ba0c-e36ef6f8f28f Apply suggestion from @szaimen Signed-off-by: Simon L. <szaimen@e.mail.de> Co-Authored-By: szaimen <42591237+szaimen@users.noreply.github.com>
112 lines
5.1 KiB
Docker
112 lines
5.1 KiB
Docker
# syntax=docker/dockerfile:latest
|
|
FROM caddy:2.11.2-alpine AS caddy
|
|
|
|
# From https://github.com/docker-library/httpd/blob/master/2.4/alpine/Dockerfile
|
|
FROM httpd:2.4.66-alpine3.23
|
|
|
|
COPY --from=caddy /usr/bin/caddy /usr/bin/caddy
|
|
|
|
COPY --chown=33:33 Caddyfile /Caddyfile
|
|
COPY --chmod=664 nextcloud.conf /usr/local/apache2/conf/nextcloud.conf
|
|
COPY --chmod=664 supervisord.conf /supervisord.conf
|
|
COPY --chmod=775 start.sh /start.sh
|
|
COPY --chmod=775 healthcheck.sh /healthcheck.sh
|
|
|
|
VOLUME /mnt/data
|
|
|
|
RUN set -ex; \
|
|
apk upgrade --no-cache -a; \
|
|
apk add --no-cache shadow; \
|
|
groupmod -g 33 www-data; \
|
|
usermod -u 33 -g 33 www-data; \
|
|
apk del --no-cache shadow; \
|
|
\
|
|
mkdir -p /mnt/data; \
|
|
chown -R www-data:www-data /mnt/data; \
|
|
chown -R 777 /tmp; \
|
|
\
|
|
apk add --no-cache \
|
|
bash \
|
|
supervisor \
|
|
tzdata \
|
|
ca-certificates \
|
|
openssl \
|
|
bind-tools \
|
|
netcat-openbsd; \
|
|
\
|
|
sed -i \
|
|
-e '/^Listen /d' \
|
|
-e 's/^#\(LoadModule .*mod_rewrite.so\)/\1/' \
|
|
-e 's/^#\(LoadModule .*mod_headers.so\)/\1/' \
|
|
-e 's/^#\(LoadModule .*mod_proxy.so\)/\1/' \
|
|
-e 's/^#\(LoadModule .*mod_proxy_fcgi.so\)/\1/' \
|
|
-e 's/^#\(LoadModule .*mod_setenvif.so\)/\1/' \
|
|
-e 's/^#\(LoadModule .*mod_env.so\)/\1/' \
|
|
-e 's/^#\(LoadModule .*mod_mime.so\)/\1/' \
|
|
-e 's/^#\(LoadModule .*mod_dir.so\)/\1/' \
|
|
-e 's/^#\(LoadModule .*mod_authz_core.so\)/\1/' \
|
|
-e 's/^#\(LoadModule .*mod_alias.so\)/\1/' \
|
|
-e 's/^#\(LoadModule .*mod_mpm_event.so\)/\1/' \
|
|
-e 's/^#\(LoadModule .*mod_brotli.so\)/\1/' \
|
|
-e 's/\(LoadModule .*mod_mpm_worker.so\)/#\1/' \
|
|
-e 's/\(LoadModule .*mod_mpm_prefork.so\)/#\1/' \
|
|
-e 's/\(ScriptAlias \)/#\1/' \
|
|
/usr/local/apache2/conf/httpd.conf; \
|
|
echo "Include conf/nextcloud.conf" | tee -a /usr/local/apache2/conf/httpd.conf; \
|
|
echo "ServerName localhost" | tee -a /usr/local/apache2/conf/httpd.conf; \
|
|
# Sync this with max db connections and pm.max_children
|
|
# We don't actually expect so many workers but don't want to limit it artificially because people will report issues otherwise.
|
|
sed -i 's|MaxRequestWorkers.*|MaxRequestWorkers 5000|' /usr/local/apache2/conf/extra/httpd-mpm.conf; \
|
|
grep -q '<IfModule mpm_event_module>' /usr/local/apache2/conf/extra/httpd-mpm.conf; \
|
|
# ServerLimit needs to be set to MaxRequestWorkers divided by ThreadsPerChild which is set to 25 by default
|
|
sed -i '/<IfModule mpm_event_module>/a\ \ \ \ ServerLimit 200' /usr/local/apache2/conf/extra/httpd-mpm.conf; \
|
|
# Pin ThreadsPerChild so the value is deterministic regardless of the httpd base-image
|
|
# defaults; 25 threads per process balances concurrency against per-process memory use.
|
|
sed -i 's|ThreadsPerChild.*|ThreadsPerChild 25|' /usr/local/apache2/conf/extra/httpd-mpm.conf; \
|
|
# Start two server processes on boot to absorb the first requests without spawning
|
|
# new processes on the critical path, while avoiding unnecessary memory overhead.
|
|
sed -i 's|StartServers.*|StartServers 2|' /usr/local/apache2/conf/extra/httpd-mpm.conf; \
|
|
# Keep at least 25 idle threads (one full process worth) so traffic bursts can be
|
|
# absorbed immediately without triggering new process creation.
|
|
sed -i 's|MinSpareThreads.*|MinSpareThreads 25|' /usr/local/apache2/conf/extra/httpd-mpm.conf; \
|
|
# Retire idle threads above 50 to reclaim memory during quiet periods. 50 is the
|
|
# minimum valid value (MinSpareThreads + ThreadsPerChild = 25 + 25) and is enough
|
|
# to absorb typical bursts without respawning a new process.
|
|
sed -i 's|MaxSpareThreads.*|MaxSpareThreads 50|' /usr/local/apache2/conf/extra/httpd-mpm.conf; \
|
|
\
|
|
rm -rf /usr/local/apache2/conf/original /var/www; \
|
|
mkdir -p /var/www; \
|
|
chown -R www-data:www-data /var/www; \
|
|
\
|
|
mkdir /var/log/supervisord; \
|
|
mkdir /var/run/supervisord; \
|
|
chown www-data:www-data /var/run/supervisord; \
|
|
chown www-data:www-data /var/log/supervisord; \
|
|
chmod 777 /var/run/supervisord; \
|
|
chmod 777 /var/log/supervisord; \
|
|
\
|
|
chown -R www-data:www-data /usr/local/apache2; \
|
|
chmod +r -R /usr/local/apache2; \
|
|
mkdir -p /usr/local/apache2/logs; \
|
|
chmod 777 -R /home/www-data; \
|
|
chmod 777 -R /usr/local/apache2/logs; \
|
|
rm -rf /usr/local/apache2/cgi-bin/; \
|
|
\
|
|
echo "root:$(openssl rand -base64 12)" | chpasswd; \
|
|
apk --no-cache del openssl
|
|
|
|
USER 33
|
|
|
|
ENTRYPOINT ["/start.sh"]
|
|
CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]
|
|
|
|
HEALTHCHECK CMD /healthcheck.sh
|
|
LABEL com.centurylinklabs.watchtower.enable="false" \
|
|
wud.watch="false" \
|
|
org.opencontainers.image.title="Apache and Caddy for Nextcloud AIO" \
|
|
org.opencontainers.image.description="Apache HTTP server with Caddy for Nextcloud All-in-One" \
|
|
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
|
org.opencontainers.image.source="https://github.com/nextcloud/all-in-one" \
|
|
org.opencontainers.image.vendor="Nextcloud" \
|
|
org.opencontainers.image.documentation="https://github.com/nextcloud/all-in-one/blob/main/readme.md"
|