189 Commits

Author SHA1 Message Date
Simon L.
01365c817f fix: apache container not stopping on SIGTERM (#8051) 2026-05-18 12:48:54 +02:00
Simon L.
e9a2076a9c apache: revert some changes to nextcloud.conf
Signed-off-by: Simon L. <szaimen@e.mail.de>
2026-05-18 11:56:14 +02:00
dependabot[bot]
5eb6850d92 build(deps): bump caddy in /Containers/apache
Bumps caddy from 2.11.2-alpine to 2.11.3-alpine.

---
updated-dependencies:
- dependency-name: caddy
  dependency-version: 2.11.3-alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-05-13 04:20:36 +00:00
dependabot[bot]
f2076fa56b build(deps): bump httpd in /Containers/apache
Bumps httpd from 2.4.66-alpine3.23 to 2.4.67-alpine3.23.

---
updated-dependencies:
- dependency-name: httpd
  dependency-version: 2.4.67-alpine3.23
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-05-06 04:19:18 +00:00
copilot-swe-agent[bot]
0be797a531 fix: use httpd directly instead of apachectl to fix SIGTERM handling
Agent-Logs-Url: https://github.com/nextcloud/all-in-one/sessions/6e288352-eba8-4697-978e-d0b11349fe3f

Co-authored-by: szaimen <42591237+szaimen@users.noreply.github.com>
2026-05-04 11:11:45 +00:00
Simon L.
55790da3eb caddy: revert being able to adjust the log level for it for now
Signed-off-by: Simon L. <szaimen@e.mail.de>
2026-04-29 14:47:32 +02:00
Simon L.
d8aa83f4e0 allow to adjust the log level globally (apache)
Signed-off-by: Simon L. <szaimen@e.mail.de>
2026-04-24 10:34:43 +02:00
copilot-swe-agent[bot]
49a24272f6 perf(apache): improve performance of the Apache container
- 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>
2026-04-20 15:57:02 +02:00
Erwan Hervé
52c3192f26 chore: add OCI standard labels to all Dockerfiles (#7899)
Signed-off-by: Erwan Hervé <erwan.herve@outlook.fr>
Signed-off-by: Erwan Hervé <62173453+Erwan-loot@users.noreply.github.com>
Co-authored-by: Simon L. <szaimen@e.mail.de>
2026-04-17 10:42:55 +02:00
Zoey
24bc70fce6 apply hsts header to all nextcloud routes
Signed-off-by: Zoey <zoey@z0ey.de>
2026-04-16 18:01:25 +02:00
Zoey
12e129f1f6 aio-interface: improve headers (#7690)
Signed-off-by: Zoey <zoey@z0ey.de>
Signed-off-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Pablo Zmdl <pablo@nextcloud.com>
Co-authored-by: Simon L. <szaimen@e.mail.de>
Co-authored-by: Pablo Zmdl <pablo@nextcloud.com>
2026-04-16 17:20:50 +02:00
Pablo Zmdl
3f11a48657 Update Containers/apache/Caddyfile
Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Pablo Zmdl <57864086+pabzm@users.noreply.github.com>
2026-04-10 14:56:44 +02:00
Pablo Zmdl
0a96759c72 Add an explanation why we disable the HTTP challenge in that Caddy instance
Signed-off-by: Pablo Zmdl <pablo@nextcloud.com>
2026-04-10 14:51:51 +02:00
Zoey
4ac496b89c change default acme profile (1/2)
Signed-off-by: Zoey <zoey@z0ey.de>
2026-03-25 20:48:21 +01:00
Alan Savage
46b325f2bd Workaround #7757 with nextcloud-aio-apache FQDN
CollaboraOnline/online/pull/13869 prevents http://nextcloud-aio-apache:23973 from
being correctly recognized as a valid URI and thus breaks matching as an
authorized WOPI host.

This uses http://nextcloud-aio-apache.nextcloud-aio:23973 which is correctly
recognized as a valid URI.

Signed-off-by: Alan Savage <3028205+asavageiv@users.noreply.github.com>
2026-03-20 15:42:49 +01:00
dependabot[bot]
ee137e497a build(deps): bump caddy in /Containers/apache
Bumps caddy from 2.11.1-alpine to 2.11.2-alpine.

---
updated-dependencies:
- dependency-name: caddy
  dependency-version: 2.11.2-alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-03-09 04:09:36 +00:00
dependabot[bot]
00d7dc6c43 build(deps): bump caddy in /Containers/apache
Bumps caddy from 2.10.2-alpine to 2.11.1-alpine.

---
updated-dependencies:
- dependency-name: caddy
  dependency-version: 2.11.1-alpine
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-02-24 04:07:33 +00:00
Oleksandr Piskun
987191ac14 feat(app-api): add HaRP container (#7493)
Signed-off-by: Oleksander Piskun <oleksandr2088@icloud.com>
Signed-off-by: bigcat88 <bigcat88@icloud.com>
Signed-off-by: Oleksandr Piskun <oleksandr2088@icloud.com>
Signed-off-by: Simon L. <szaimen@e.mail.de>
Co-authored-by: Simon L. <szaimen@e.mail.de>
2026-02-18 13:45:44 +01:00
Simon L.
14d6579893 redis and apache: delete openssl after using it
Signed-off-by: Simon L. <szaimen@e.mail.de>
2026-02-06 17:23:02 +01:00
Simon L.
0e22f38d16 add wud.watch=false to all containers
Signed-off-by: Simon L. <szaimen@e.mail.de>
2026-01-19 17:10:22 +01:00
Simon L.
06cdd8eca1 update remaining dependencies to alpine 3.23
Signed-off-by: Simon L. <szaimen@e.mail.de>
2026-01-05 09:57:39 +01:00
dependabot[bot]
57efcd852d build(deps): bump httpd in /Containers/apache
Bumps httpd from 2.4.65-alpine3.22 to 2.4.66-alpine3.22.

---
updated-dependencies:
- dependency-name: httpd
  dependency-version: 2.4.66-alpine3.22
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-12-05 04:12:33 +00:00
Simon L.
fa06f1c425 delete caddy locks if existing on startup
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-10-01 12:29:14 +02:00
Alan Savage
d2e944f7dc Use a fixed port for internal WOPI requests and callbacks
This fixes the issue where Caddy fails to start when APACHE_PORT
was 443.

Signed-off-by: Alan Savage <3028205+asavageiv@users.noreply.github.com>
2025-09-05 06:18:18 -07:00
Simon L.
0521a87999 Merge pull request #6676 from asavageiv/alan/internal-wopi-requests
Configure WOPI requests to remain within the Docker network
2025-09-05 12:49:24 +02:00
Alan Savage
5f4fae140a Make APACHE_HOST an optional param in apache/Caddyfile
Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Alan Savage <asavageiv@users.noreply.github.com>
2025-09-04 08:57:40 -07:00
Alan Savage
1f7ccba5c8 Configure WOPI requests to remain within the Docker network
Signed-off-by: Alan Savage <3028205+asavageiv@users.noreply.github.com>
2025-08-29 08:27:32 -07:00
dependabot[bot]
1e579b049e build(deps): bump caddy in /Containers/apache
Bumps caddy from 2.10.0-alpine to 2.10.2-alpine.

---
updated-dependencies:
- dependency-name: caddy
  dependency-version: 2.10.2-alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-08-28 05:55:45 +00:00
Alan Savage
49aa732ec5 add CGNAT range to Caddy and document support for additional trusted proxies to rp docs (#6703)
Signed-off-by: Alan Savage <3028205+asavageiv@users.noreply.github.com>
Signed-off-by: Alan Savage <asavageiv@users.noreply.github.com>
Signed-off-by: Simon L. <szaimen@e.mail.de>
Co-authored-by: Alan Savage <3028205+asavageiv@users.noreply.github.com>
Co-authored-by: Simon L. <szaimen@e.mail.de>
2025-08-22 13:43:55 +02:00
dependabot[bot]
7fffb1840f build(deps): bump httpd in /Containers/apache
Bumps httpd from 2.4.64-alpine3.22 to 2.4.65-alpine3.22.

---
updated-dependencies:
- dependency-name: httpd
  dependency-version: 2.4.65-alpine3.22
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-07-24 05:11:15 +00:00
dependabot[bot]
d6e5bcc0ac build(deps): bump httpd in /Containers/apache
Bumps httpd from 2.4.63-alpine3.22 to 2.4.64-alpine3.22.

---
updated-dependencies:
- dependency-name: httpd
  dependency-version: 2.4.64-alpine3.22
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-07-18 04:49:37 +00:00
Simon L.
b2a839a209 update remaining images and docs to alpine v3.22
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-07-17 11:57:35 +02:00
Simon L.
5536121899 add org.label-schema.vendor="Nextcloud" label to all containers
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-05-19 14:31:29 +02:00
dependabot[bot]
62878cc694 build(deps): bump caddy in /Containers/apache
Bumps caddy from 2.9.1-alpine to 2.10.0-alpine.

---
updated-dependencies:
- dependency-name: caddy
  dependency-version: 2.10.0-alpine
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-22 04:25:43 +00:00
dependabot[bot]
dee3773bf3 build(deps): bump httpd in /Containers/apache
Bumps httpd from 2.4.62-alpine3.21 to 2.4.63-alpine3.21.

---
updated-dependencies:
- dependency-name: httpd
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-01-24 04:57:37 +00:00
Thorsten Schaefer
a425f5b49b Support custom port for onlyoffice
Signed-off-by: Thorsten Schaefer <github@npath.de>
2025-01-17 19:07:37 +01:00
dependabot[bot]
ea789d2dca build(deps): bump caddy in /Containers/apache
Bumps caddy from 2.8.4-alpine to 2.9.1-alpine.

---
updated-dependencies:
- dependency-name: caddy
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-01-10 04:33:25 +00:00
Simon L.
81dd6bbc72 apache-healthcheck: remove the domain test
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-01-06 11:25:09 +01:00
Simon L.
a0eaea5e95 update remaining docker images to alpine 3.21
Signed-off-by: Simon L. <szaimen@e.mail.de>
2024-12-16 12:05:46 +01:00
Simon L.
6d51b673fc adjust additional places
Signed-off-by: Simon L. <szaimen@e.mail.de>
2024-11-11 07:18:59 +01:00
Simon L.
faecc028fe add user-IDs to all containers
Signed-off-by: Simon L. <szaimen@e.mail.de>
2024-11-06 14:35:40 +01:00
Simon L.
546f11a654 add whiteboard container
Signed-off-by: Simon L. <szaimen@e.mail.de>
2024-09-16 17:59:15 +02:00
dependabot[bot]
85c606b09b build(deps): bump httpd in /Containers/apache
Bumps httpd from 2.4.61-alpine3.20 to 2.4.62-alpine3.20.

---
updated-dependencies:
- dependency-name: httpd
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-19 12:38:57 +00:00
Simon L.
22fbd73d92 add link to httpd
Signed-off-by: Simon L. <szaimen@e.mail.de>
2024-07-12 10:31:30 +02:00
dependabot[bot]
6fb4b3479e build(deps): bump httpd in /Containers/apache
Bumps httpd from 2.4.59-alpine3.20 to 2.4.61-alpine3.20.

---
updated-dependencies:
- dependency-name: httpd
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-04 12:25:34 +00:00
Simon L.
caae672466 apache,mastercontainer,nextcloud: remove xfs-user adjustments
Signed-off-by: Simon L. <szaimen@e.mail.de>
2024-06-21 13:31:26 +02:00
Simon L.
267b98bd84 fix casing of AS
Signed-off-by: Simon L. <szaimen@e.mail.de>
2024-06-21 13:16:55 +02:00
Zoey
85ede06e7b update alpine to v3.20.1 2024-06-20 23:58:19 +02:00
Simon L.
cfbb3484ae trusted-proxies: trust docker network
Signed-off-by: Simon L. <szaimen@e.mail.de>
2024-06-14 10:04:01 +02:00
Simon L.
335026ce76 fix SC
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-06-10 10:38:59 +02:00