Compare commits

...

128 Commits

Author SHA1 Message Date
Simon L
d55723dbea add missing indices on new installation
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-03-08 11:47:05 +01:00
Simon L
97b3f8465a increase to 8.0.0
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-03-08 10:50:24 +01:00
Simon L
f14a271bbc Merge pull request #4343 from p1gp1g/flushpackets
Disable Apache proxy buffering
2024-03-08 10:42:00 +01:00
Simon L
0eda1f9e9c Merge pull request #4344 from nextcloud/aio-helm-update
Helm Chart updates
2024-03-08 10:36:08 +01:00
szaimen
224feef3e3 Helm Chart updates
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2024-03-08 09:34:27 +00:00
S1m
1acdfe05e1 Disable Apache proxy buffering 2024-03-08 08:47:06 +01:00
Simon L
a915227029 add fpt configure
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-03-06 15:05:14 +01:00
Simon L
8f670a2939 Merge pull request #4337 from nextcloud/dependabot/docker/Containers/imaginary/golang-1.22.1-alpine3.18
Bump golang from 1.22.0-alpine3.18 to 1.22.1-alpine3.18 in /Containers/imaginary
2024-03-06 14:27:41 +01:00
Simon L
d1e5e3e28f Merge pull request #4336 from nextcloud/dependabot/docker/Containers/collabora/collabora/code-23.05.9.3.1
Bump collabora/code from 23.05.9.2.1 to 23.05.9.3.1 in /Containers/collabora
2024-03-06 14:27:20 +01:00
dependabot[bot]
e13d6d73e5 Bump golang in /Containers/imaginary
Bumps golang from 1.22.0-alpine3.18 to 1.22.1-alpine3.18.

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-06 12:38:23 +00:00
dependabot[bot]
78c1a63dfe Bump collabora/code in /Containers/collabora
Bumps collabora/code from 23.05.9.2.1 to 23.05.9.3.1.

---
updated-dependencies:
- dependency-name: collabora/code
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-06 12:15:37 +00:00
Simon L
17a19f0bae Merge pull request #4334 from robeatoz/add-comment-to-temporary-psql-user-ncadmin
Add note ncadmin is a temporary PostgreSQL user
2024-03-05 16:56:44 +01:00
Simon L
2978ba98c5 add one log to imaginary container so that one know that it has started
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-03-05 15:57:04 +01:00
Robert Zilke
0ee7928181 Add note ncadmin is a temporary PostgreSQL user 2024-03-05 15:17:24 +01:00
Simon L
27c783da9c Merge pull request #4332 from AiroPi/patch-1
Add informations about custom caddy rules.
2024-03-05 11:47:33 +01:00
Pıεяяε
48c0b74c4f add sudo to the docker command
Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Pıεяяε <47398145+AiroPi@users.noreply.github.com>
2024-03-05 11:15:23 +01:00
Pıεяяε
faff549b53 Add informations about custom caddy rules.
Add some "documentation" on how to add custom caddy rules with the caddy community container.

Signed-off-by: Pıεяяε <47398145+AiroPi@users.noreply.github.com>
2024-03-04 20:02:30 +01:00
Simon L
8380ee5262 Merge pull request #4330 from nextcloud/imaginary-container-update
Imaginary update
2024-03-04 14:22:16 +01:00
Simon L
d750d7cfd5 Merge pull request #4329 from nextcloud/dependabot/docker/Containers/clamav/clamav/clamav-1.3.0-41
Bump clamav/clamav from 1.3.0-40 to 1.3.0-41 in /Containers/clamav
2024-03-04 14:21:57 +01:00
szaimen
05facb91a1 imaginary-update automated change
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2024-03-04 13:04:33 +00:00
dependabot[bot]
6a0432177a Bump clamav/clamav from 1.3.0-40 to 1.3.0-41 in /Containers/clamav
Bumps clamav/clamav from 1.3.0-40 to 1.3.0-41.

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-04 12:29:52 +00:00
Simon L
e945d5b58b Merge pull request #3906 from nextcloud/enh/noid/update-local-ai
[breaking] - update aio-local-ai to v2
2024-03-04 12:54:25 +01:00
Simon L
e7f98c0957 Merge pull request #4267 from AiroPi/main
Add a jellyfin community-container
2024-03-04 12:47:04 +01:00
Simon L
cc6486ae2f Merge pull request #4326 from nextcloud/enh/4267/caddy-host-network
caddy community container - allow to access host.docker.internal
2024-03-04 12:43:05 +01:00
Simon L
64b1951f4f Merge pull request #4314 from nextcloud/enh/4298/namespace-improvement
helm - only add namespace if it is not default
2024-03-04 12:20:36 +01:00
Simon L
78b0e0042b Merge pull request #4325 from nextcloud/enh/2591/add-imaginary-key
secure imaginary with imaginary_key
2024-03-04 12:05:35 +01:00
Simon L
2416b85f9d caddy community container - allow to access host.docker.internal
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-03-04 12:04:05 +01:00
Simon L
fd3f6d9018 secure imaginary with imaginary_key
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-03-04 11:48:21 +01:00
Simon L
6bc2d1d6ae Merge pull request #4324 from nextcloud/enh/noid/set-maintenance-window
nextcloud - set maintenance_window_start
2024-03-04 11:27:09 +01:00
Simon L
75eb2fd7aa nextcloud - set maintenance_window_start
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-03-04 11:25:30 +01:00
Simon L
edb70a1471 Merge pull request #4323 from nextcloud/enh/4123/drop-proxy-sendcl
apache - drop SetEnv proxy-sendcl 1
2024-03-04 11:19:37 +01:00
Simon L
c844b4dbef apache - drop SetEnv proxy-sendcl 1
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-03-04 11:18:29 +01:00
Simon L
b866fe25db address review
Signed-off-by: Simon L <szaimen@e.mail.de>

Co-authored-by: Richard Steinmetz <richard@steinmetz.cloud>
Signed-off-by: Simon L. <szaimen@e.mail.de>
2024-03-04 11:16:23 +01:00
Simon L
973d503212 Merge pull request #4322 from nextcloud/enh/3888/remove-upgrade-hint
remove 28 upgrade hint from AIO interface
2024-03-04 11:10:31 +01:00
Simon L
fea71433c8 remove upgrade hint from AIO interface
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-03-04 11:08:08 +01:00
Simon L
45e87ca05a Merge pull request #4320 from nextcloud/enh/2534/update-to-php8.2
update nextcloud container to php8.2
2024-03-04 11:06:36 +01:00
Simon L
15e69ec433 Merge pull request #4321 from nextcloud/enh/3888/update-nc
update Nextcloud to 28.0.3
2024-03-04 11:05:36 +01:00
Simon L
b54ff9503a update Nextcloud to 28.0.3
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-03-04 11:04:22 +01:00
Simon L
995fca1ba6 update nextcloud container to php8.2
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-03-04 11:01:11 +01:00
Simon L
4c7f842cb2 Merge pull request #4318 from nextcloud/enh/4265/update-mastercontainer
update mastercontainer to php8.3
2024-03-04 10:56:14 +01:00
Simon L
f7eaa74768 Merge pull request #4316 from nextcloud/enh/3888/increase-aio-version
increase version of aio app
2024-03-04 10:55:59 +01:00
Simon L
b5469ad372 update mastercontainer to php8.3
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-03-04 10:49:42 +01:00
Simon L
48f6d8317a increase version of aio app
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-03-04 10:40:23 +01:00
Simon L
f0bf35e57c helm - only add namespace if it is not default
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-03-04 10:36:52 +01:00
Simon L
d8e3c83afc Merge pull request #4312 from nextcloud/enh/4297/adjust-strategy
helm chart - adjust strategy to recreate
2024-03-04 10:12:34 +01:00
Simon L
1f2920633d helm chart - adjust strategy to recreate
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-03-04 10:11:37 +01:00
Simon L
7254120e6c Merge pull request #4302 from FaySmash/patch-1
Fixed replace statement
2024-03-02 00:51:40 +01:00
FaySmash
0808ab7dca Fixed replace statement
Signed-off-by: FaySmash <30392780+FaySmash@users.noreply.github.com>
2024-03-01 19:46:59 +01:00
Simon L
68d66a53fb increase to 7.13.1
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-03-01 18:35:24 +01:00
Simon L
112cc010b9 Merge pull request #4116 from jhesketh/patch-1
Drop NET_RAW from all containers in manual
2024-03-01 18:34:20 +01:00
Simon L
20c3fbc154 add it to jscon schema
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-03-01 18:31:49 +01:00
Simon L
426c46d0ae Merge pull request #4279 from FaySmash/patch-1
Added a replace statement for the database-dump.sql
2024-03-01 18:27:56 +01:00
Simon L
04ff2c9935 Merge pull request #4293 from rugk/patch-1
Fix and beautify link to Docker --init
2024-03-01 18:27:29 +01:00
Simon L
bf307eb5ff Merge pull request #4134 from nextcloud/nextcloud-container-update
Nextcloud dependency update
2024-02-29 15:12:32 +01:00
szaimen
6dbb0841bf nextcloud-update automated change
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2024-02-29 12:33:50 +00:00
rugk
8f14e47401 Fix and beautify link to Docker --init
* The content has moved and is apparently now there (old link did not work):
* I use a link text instead of a plain link.

Signed-off-by: rugk <rugk+git@posteo.de>
2024-02-29 11:39:55 +01:00
Simon L
4abeeaf1b3 Merge pull request #4292 from nextcloud/enh/noid/move-entrypoint
nextcloud entrypoint - move /usr/src/nextcloud to SOURCE_LOCATION
2024-02-28 22:02:11 +01:00
Simon L
ce506564cb nextcloud entrypoint - move /usr/src/nextcloud to SOURCE_LOCATION
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-02-28 21:57:25 +01:00
Simon L
4810797d02 change a detail
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-02-28 19:51:04 +01:00
Simon L
bc79fd1877 adjust order of detail
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-02-28 19:45:19 +01:00
Simon L
087943b1ba Merge pull request #4163 from nextcloud/aio-helm-update
Helm Chart updates
2024-02-28 19:31:54 +01:00
szaimen
356e32f3d1 Helm Chart updates
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2024-02-28 18:30:56 +00:00
Simon L
9c7a35dc23 add some comments to some files
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-02-28 19:08:00 +01:00
Simon L
175d9a3112 Merge pull request #4287 from nextcloud/dependabot/docker/Containers/collabora/collabora/code-23.05.9.2.1
Bump collabora/code from 23.05.9.1.1 to 23.05.9.2.1 in /Containers/collabora
2024-02-28 18:28:50 +01:00
Simon L
22224a4604 Merge pull request #4286 from nextcloud/dependabot/docker/Containers/docker-socket-proxy/haproxy-2.9.6-alpine3.19
Bump haproxy from 2.9.5-alpine3.19 to 2.9.6-alpine3.19 in /Containers/docker-socket-proxy
2024-02-28 18:28:37 +01:00
Simon L
905f1c7264 Merge pull request #4283 from nextcloud/dependabot/docker/Containers/clamav/clamav/clamav-1.3.0-40
Bump clamav/clamav from 1.3.0-39 to 1.3.0-40 in /Containers/clamav
2024-02-28 18:28:11 +01:00
Simon L
0e30956b75 Merge pull request #4268 from nextcloud/automated/noid/psalm-baseline-update
[Automated] Update psalm-baseline.xml
2024-02-28 18:27:59 +01:00
Simon L
ad2329fdd2 Merge pull request #4269 from nextcloud/dependabot/docker/Containers/fulltextsearch/elasticsearch-8.12.2
Bump elasticsearch from 8.12.1 to 8.12.2 in /Containers/fulltextsearch
2024-02-28 18:27:47 +01:00
Simon L
9b8ceb1a7d update OO
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-02-28 18:26:56 +01:00
Simon L
baacf24a4d helm - put namespace into quotes
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-02-28 12:01:30 +01:00
dependabot[bot]
d5b6252b83 Bump collabora/code in /Containers/collabora
Bumps collabora/code from 23.05.9.1.1 to 23.05.9.2.1.

---
updated-dependencies:
- dependency-name: collabora/code
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-27 13:04:46 +00:00
dependabot[bot]
701562416c Bump haproxy in /Containers/docker-socket-proxy
Bumps haproxy from 2.9.5-alpine3.19 to 2.9.6-alpine3.19.

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-27 12:11:52 +00:00
dependabot[bot]
ad68418245 Bump clamav/clamav from 1.3.0-39 to 1.3.0-40 in /Containers/clamav
Bumps clamav/clamav from 1.3.0-39 to 1.3.0-40.

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-26 12:30:29 +00:00
FaySmash
dba7e43e7f Added a replace statement for the database-dump.sql
Without this statement, only the comments in the database-dump.sql which state the table owner get replaced but from not the important ALTER TABLE statement itself.

Signed-off-by: FaySmash <30392780+FaySmash@users.noreply.github.com>
2024-02-25 16:13:39 +01:00
nextcloud-command
a5ec42bbcb Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2024-02-24 04:56:22 +00:00
Simon L
fbf32ebae0 Merge pull request #4270 from nextcloud/enh/noid/disable-fts-volume
helm chart - disable FTS volume if not enabled
2024-02-23 17:56:06 +01:00
Pıεяяε
99a0069460 Updated README for Jellyfin, Plex, and Caddy
- Added incompatibilities between Jellyfin and Plex.
- Included note about Caddy handling `media.$NC_DOMAIN`.
- Added information about setting up a reverse proxy.
- Included security notice for Jellyfin initial setup.

Signed-off-by: Pıεяяε <47398145+AiroPi@users.noreply.github.com>
2024-02-23 16:39:34 +00:00
Pıεяяε
187d86619a Change Plex to Jellyfin in the readme
Oops, my copy/paste is spotted

Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Pıεяяε <47398145+AiroPi@users.noreply.github.com>
2024-02-23 16:39:34 +00:00
AiroPi
9ac868f636 Add jellyfin community-container
Signed-off-by: AiroPi <47398145+AiroPi@users.noreply.github.com>
Signed-off-by: Pıεяяε <47398145+AiroPi@users.noreply.github.com>
2024-02-23 16:39:34 +00:00
Simon L
ba7bc4818a helm chart - disable FTS volume if not enabled
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-02-23 16:19:27 +01:00
dependabot[bot]
da60cc44bf Bump elasticsearch from 8.12.1 to 8.12.2 in /Containers/fulltextsearch
Bumps elasticsearch from 8.12.1 to 8.12.2.

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-23 12:41:30 +00:00
Simon L
622a927a8c Merge pull request #4259 from nextcloud/imaginary-container-update
Imaginary update
2024-02-21 13:17:49 +01:00
szaimen
fedb214387 imaginary-update automated change
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2024-02-21 12:02:15 +00:00
Simon L
d4245da813 increase to 7.13.0
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-02-21 12:55:09 +01:00
Simon L
f46b0c489f Merge pull request #4253 from nextcloud/enh/noid/imaginary-switch
revert imaginary container to alpine3.18
2024-02-21 12:53:56 +01:00
Simon L
5e86d7baaf Merge pull request #4256 from nextcloud/enh/noid/harden-pulling-images
harden pulling images from docker hub issues
2024-02-20 15:47:56 +01:00
Simon L
93dd64f5ee harden pulling images from docker hub issues
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-02-20 15:44:25 +01:00
Simon L
f0210e8594 Merge pull request #4254 from nextcloud/enh/noid/log-whole-error
log the whole exception if container could not be started
2024-02-20 14:49:26 +01:00
Simon L
c61261a0a1 log the whole exception if container could not be started
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-02-20 14:39:20 +01:00
Simon L
1ac7d7866e revert imaginary container to alpine3.18
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-02-20 14:07:59 +01:00
Simon L
4a121ed613 Merge pull request #4249 from nextcloud/bugfix/noid/appsallowlist
fix: Do not apply an empty allow list if none is set
2024-02-19 16:16:14 +01:00
Julius Härtl
dacd48cfd0 fix: Do not apply an empty allow list if none is set
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2024-02-19 16:09:51 +01:00
Simon L
0befd813d9 Merge pull request #4247 from nextcloud/dependabot/docker/Containers/docker-socket-proxy/haproxy-2.9.5-alpine3.19
Bump haproxy from 2.9.4-alpine3.19 to 2.9.5-alpine3.19 in /Containers/docker-socket-proxy
2024-02-19 14:06:28 +01:00
Simon L
d3fba3134c Merge pull request #4246 from nextcloud/dependabot/docker/Containers/clamav/clamav/clamav-1.3.0-39
Bump clamav/clamav from 1.3.0-38 to 1.3.0-39 in /Containers/clamav
2024-02-19 14:06:09 +01:00
dependabot[bot]
e04a47a143 Bump haproxy in /Containers/docker-socket-proxy
Bumps haproxy from 2.9.4-alpine3.19 to 2.9.5-alpine3.19.

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-19 12:55:42 +00:00
dependabot[bot]
3899428161 Bump clamav/clamav from 1.3.0-38 to 1.3.0-39 in /Containers/clamav
Bumps clamav/clamav from 1.3.0-38 to 1.3.0-39.

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-19 12:44:22 +00:00
Simon L
15e3fd1f5e Merge pull request #4244 from nextcloud/dependabot/docker/Containers/talk/nats-2.10.11-scratch
Bump nats from 2.10.10-scratch to 2.10.11-scratch in /Containers/talk
2024-02-19 13:23:21 +01:00
Simon L
1e17a21e48 Merge pull request #4245 from nextcloud/dependabot/docker/Containers/mastercontainer/php-8.2.16-fpm-alpine3.19
Bump php from 8.2.15-fpm-alpine3.19 to 8.2.16-fpm-alpine3.19 in /Containers/mastercontainer
2024-02-19 13:23:01 +01:00
dependabot[bot]
fba263e671 Bump php in /Containers/mastercontainer
Bumps php from 8.2.15-fpm-alpine3.19 to 8.2.16-fpm-alpine3.19.

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-19 12:22:17 +00:00
dependabot[bot]
5dba923eff Bump nats from 2.10.10-scratch to 2.10.11-scratch in /Containers/talk
Bumps nats from 2.10.10-scratch to 2.10.11-scratch.

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-19 12:15:15 +00:00
Simon L
41b58ddc5e Merge pull request #4237 from nextcloud/imaginary-container-update
Imaginary update
2024-02-17 14:40:44 +01:00
szaimen
11de100d50 imaginary-update automated change
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2024-02-17 12:02:06 +00:00
Simon L
d76da00211 Merge pull request #4234 from AiroPi/readme/drive-change-extra-infos
Add extra informations about root-data change for Docker
2024-02-17 00:26:30 +01:00
Simon L
e2e613038f Merge pull request #4235 from AiroPi/fix/pi-hole-url
Fix pi-hole dashboard page url
2024-02-17 00:24:49 +01:00
airo.pi_
bbbd553300 Fix pi-hole config page url 2024-02-16 20:16:26 +01:00
airo.pi_
df8a6c4ca2 Add extra informations about root-data change for Docker
https://github.com/nextcloud/all-in-one/discussions/4224
2024-02-16 20:12:37 +01:00
Simon L
c9b5814bde Merge pull request #4232 from nextcloud/dockefiel-syntax
add syntax=docker/dockerfile:latest
2024-02-16 16:35:48 +01:00
Zoey
9ba0dbf6a3 add # syntax=docker/dockerfile:latest
Signed-off-by: Zoey <zoey@z0ey.de>
2024-02-16 16:21:18 +01:00
Simon L
7a1459fa84 Merge pull request #4231 from nextcloud/dependabot/docker/Containers/collabora/collabora/code-23.05.9.1.1
Bump collabora/code from 23.05.8.4.1 to 23.05.9.1.1 in /Containers/collabora
2024-02-16 16:03:00 +01:00
dependabot[bot]
f2d5cfab35 Bump collabora/code in /Containers/collabora
Bumps collabora/code from 23.05.8.4.1 to 23.05.9.1.1.

---
updated-dependencies:
- dependency-name: collabora/code
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-16 12:50:33 +00:00
Simon L
999f0c1bf5 Merge pull request #4227 from nextcloud/automated/noid/psalm-baseline-update
[Automated] Update psalm-baseline.xml
2024-02-16 08:03:24 +01:00
nextcloud-command
255895e219 Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2024-02-16 04:09:01 +00:00
Simon L
bd1ec4fd81 Merge pull request #4210 from nextcloud/hide-caddy-headers
hider server and x-powered-by header
2024-02-15 11:36:17 +01:00
Simon L
aeac2b54fc Merge pull request #4214 from nextcloud/dependabot/docker/Containers/postgresql/postgres-15.6-alpine
Bump postgres from 15.5-alpine to 15.6-alpine in /Containers/postgresql
2024-02-15 10:32:04 +01:00
Simon L
9d58723998 Merge pull request #4213 from nextcloud/dependabot/docker/Containers/clamav/clamav/clamav-1.3.0-38
Bump clamav/clamav from 1.2.1-30 to 1.3.0-38 in /Containers/clamav
2024-02-15 10:31:42 +01:00
Simon L
c504e32142 Merge pull request #4212 from nextcloud/dependabot/github_actions/helm/kind-action-1.9.0
Bump helm/kind-action from 1.8.0 to 1.9.0
2024-02-15 10:31:25 +01:00
Simon L
8e532d4a6d Merge pull request #4196 from nextcloud/dependabot/docker/Containers/mastercontainer/docker-25.0.3-cli
Bump docker from 25.0.2-cli to 25.0.3-cli in /Containers/mastercontainer
2024-02-15 10:28:20 +01:00
Simon L
511c433549 Merge pull request #4194 from nextcloud/dependabot/docker/Containers/talk-recording/python-3.12.2-alpine3.19
Bump python from 3.12.1-alpine3.19 to 3.12.2-alpine3.19 in /Containers/talk-recording
2024-02-15 10:27:59 +01:00
Simon L
e30a96dc31 Merge pull request #4219 from nextcloud/automated/noid/psalm-baseline-update
[Automated] Update psalm-baseline.xml
2024-02-15 08:43:00 +01:00
nextcloud-command
7cadc15c82 Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2024-02-15 04:09:41 +00:00
dependabot[bot]
4a2092b0f5 Bump postgres from 15.5-alpine to 15.6-alpine in /Containers/postgresql
Bumps postgres from 15.5-alpine to 15.6-alpine.

---
updated-dependencies:
- dependency-name: postgres
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-13 12:20:34 +00:00
dependabot[bot]
1c594ec74b Bump clamav/clamav from 1.2.1-30 to 1.3.0-38 in /Containers/clamav
Bumps clamav/clamav from 1.2.1-30 to 1.3.0-38.

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-12 12:41:54 +00:00
dependabot[bot]
68bef922fb Bump helm/kind-action from 1.8.0 to 1.9.0
Bumps [helm/kind-action](https://github.com/helm/kind-action) from 1.8.0 to 1.9.0.
- [Release notes](https://github.com/helm/kind-action/releases)
- [Commits](https://github.com/helm/kind-action/compare/v1.8.0...v1.9.0)

---
updated-dependencies:
- dependency-name: helm/kind-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-12 12:31:09 +00:00
Joshua Hesketh
1e26613960 Drop NET_RAW from all containers in manual
#3377 drops NET_RAW from all containers, but this doesn't
appear to have been adopted into the manual mode.

Signed-off-by: Joshua Hesketh <josh@hesketh.net.au>
2024-02-12 14:05:50 +11:00
Zoey
56673bdee2 hider server and x-powered-by header
Signed-off-by: Zoey <zoey@z0ey.de>
2024-02-11 22:08:21 +01:00
dependabot[bot]
81f4a59a73 Bump docker from 25.0.2-cli to 25.0.3-cli in /Containers/mastercontainer
Bumps docker from 25.0.2-cli to 25.0.3-cli.

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-08 12:47:35 +00:00
dependabot[bot]
ce2a09df5e Bump python in /Containers/talk-recording
Bumps python from 3.12.1-alpine3.19 to 3.12.2-alpine3.19.

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-08 12:33:15 +00:00
Simon L
c603b17625 [breaking] - update aio-local-ai to v2
Breaking because they no longer ship Arm64 images and thus it can no longer run on arm64 and would fail to start in that case.
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-12-08 14:43:46 +01:00
85 changed files with 483 additions and 175 deletions

View File

@@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2
with:
php-version: 8.2
php-version: 8.3
extensions: apcu
- name: Run dependency update script
run: |

View File

@@ -28,7 +28,7 @@ jobs:
run: ct lint --target-branch ${{ github.event.repository.default_branch }} --debug --chart-dirs nextcloud-aio-helm-chart
- name: Create kind cluster
uses: helm/kind-action@v1.8.0
uses: helm/kind-action@v1.9.0
- name: Run chart-testing (install)
id: install

View File

@@ -27,7 +27,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: [ "8.2" ]
php-versions: [ "8.3" ]
name: php-lint

View File

@@ -17,10 +17,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up php8.2
- name: Set up php
uses: shivammathur/setup-php@v2
with:
php-version: 8.2
php-version: 8.3
extensions: apcu
coverage: none

View File

@@ -12,10 +12,10 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up php8.2
- name: Set up php
uses: shivammathur/setup-php@v2
with:
php-version: 8.2
php-version: 8.3
extensions: apcu
coverage: none

View File

@@ -31,7 +31,7 @@ jobs:
- name: Set up php
uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
with:
php-version: 8.2
php-version: 8.3
extensions: apcu
coverage: none
ini-file: development

View File

@@ -29,7 +29,7 @@ jobs:
- name: Set up php ${{ matrix.php-versions }}
uses: shivammathur/setup-php@v2
with:
php-version: 8.2
php-version: 8.3
extensions: apcu
coverage: none

View File

@@ -16,6 +16,8 @@
https://{$ADDITIONAL_TRUSTED_DOMAIN}:443,
{$PROTOCOL}://{$NC_DOMAIN}:{$APACHE_PORT} {
header -Server
header -X-Powered-By
# Collabora
route /browser/* {

View File

@@ -1,3 +1,4 @@
# syntax=docker/dockerfile:latest
FROM caddy:2.7.6-alpine as caddy
FROM httpd:2.4.58-alpine3.19

View File

@@ -14,6 +14,9 @@ Listen 8000
SetHandler "proxy:fcgi://${NEXTCLOUD_HOST}:9000"
</FilesMatch>
<Proxy "fcgi://${NEXTCLOUD_HOST}:9000" flushpackets=on>
</Proxy>
# Enable Brotli compression for js, css and svg files - other plain files are compressed by Nextcloud by default
<IfModule mod_brotli.c>
AddOutputFilterByType BROTLI_COMPRESS text/javascript application/javascript application/x-javascript text/css image/svg+xml
@@ -37,10 +40,6 @@ Listen 8000
Require all denied
</Files>
# Fix zero file sizes
# See https://github.com/nextcloud/server/issues/3056#issuecomment-954209565
SetEnv proxy-sendcl 1
# See https://httpd.apache.org/docs/current/en/mod/core.html#limitrequestbody
LimitRequestBody ${APACHE_MAX_SIZE}

View File

@@ -1,3 +1,4 @@
# syntax=docker/dockerfile:latest
FROM alpine:3.19.1
RUN set -ex; \

View File

@@ -1,5 +1,6 @@
# syntax=docker/dockerfile:latest
# Probably from this file: https://github.com/Cisco-Talos/clamav-docker/blob/main/clamav/1.1/alpine/Dockerfile
FROM clamav/clamav:1.2.1-30
FROM clamav/clamav:1.3.0-41
COPY clamav.conf /tmp/clamav.conf

View File

@@ -1,5 +1,6 @@
# syntax=docker/dockerfile:latest
# From a file located probably somewhere here: https://github.com/CollaboraOnline/online/tree/master/docker
FROM collabora/code:23.05.8.4.1
FROM collabora/code:23.05.9.3.1
USER root

View File

@@ -1,4 +1,5 @@
FROM haproxy:2.9.4-alpine3.19
# syntax=docker/dockerfile:latest
FROM haproxy:2.9.6-alpine3.19
# hadolint ignore=DL3002
USER root

View File

@@ -1,3 +1,4 @@
# syntax=docker/dockerfile:latest
FROM alpine:3.19.1
RUN set -ex; \
apk add --no-cache bash lighttpd netcat-openbsd; \

View File

@@ -1,5 +1,6 @@
# syntax=docker/dockerfile:latest
# Probably from here https://github.com/elastic/elasticsearch/blob/main/distribution/docker/src/docker/Dockerfile
FROM elasticsearch:8.12.1
FROM elasticsearch:8.12.2
USER root

View File

@@ -1,4 +1,5 @@
FROM golang:1.22.0-alpine3.19 as go
# syntax=docker/dockerfile:latest
FROM golang:1.22.1-alpine3.18 as go
ENV IMAGINARY_HASH 6cd9edd1d3fb151eb773c14552886e4fc8e50138
@@ -12,7 +13,7 @@ RUN set -ex; \
build-base; \
go install github.com/h2non/imaginary@"$IMAGINARY_HASH";
FROM alpine:3.19.1
FROM alpine:3.18.6
RUN set -ex; \
apk add --no-cache \
tzdata \
@@ -22,9 +23,11 @@ RUN set -ex; \
vips-magick \
vips-heif \
vips-jxl \
vips-poppler
vips-poppler \
bash
COPY --from=go /go/bin/imaginary /usr/local/bin/imaginary
COPY --chmod=775 start.sh /start.sh
ENV PORT 9000
@@ -32,7 +35,7 @@ USER nobody
# https://github.com/h2non/imaginary#memory-issues
ENV MALLOC_ARENA_MAX=2
ENTRYPOINT ["imaginary", "-return-size", "-max-allowed-resolution", "222.2"]
ENTRYPOINT ["/start.sh"]
HEALTHCHECK CMD nc -z localhost "$PORT" || exit 1
LABEL com.centurylinklabs.watchtower.enable="false"

View File

@@ -0,0 +1,8 @@
#!/bin/bash
echo "Imaginary has started"
if [ -z "$IMAGINARY_SECRET" ]; then
imaginary -return-size -max-allowed-resolution 222.2 "$@"
else
imaginary -return-size -max-allowed-resolution 222.2 -key "$IMAGINARY_SECRET" "$@"
fi

View File

@@ -1,11 +1,12 @@
# syntax=docker/dockerfile:latest
# Docker CLI is a requirement
FROM docker:25.0.2-cli as docker
FROM docker:25.0.3-cli as docker
# Caddy is a requirement
FROM caddy:2.7.6-alpine as caddy
# From https://github.com/docker-library/php/blob/master/8.2/alpine3.19/fpm/Dockerfile
FROM php:8.2.15-fpm-alpine3.19
# From https://github.com/docker-library/php/blob/master/8.3/alpine3.19/fpm/Dockerfile
FROM php:8.3.3-fpm-alpine3.19
EXPOSE 80
EXPOSE 8080

View File

@@ -1,16 +1,21 @@
FROM php:8.1.27-fpm-alpine3.19
# syntax=docker/dockerfile:latest
FROM php:8.2.16-fpm-alpine3.19
ENV PHP_MEMORY_LIMIT 512M
ENV PHP_UPLOAD_LIMIT 10G
ENV PHP_MAX_TIME 3600
ENV NEXTCLOUD_VERSION 27.1.5
ENV SOURCE_LOCATION /usr/src/nextcloud
# AIO settings start # Do not remove or change this line!
ENV NEXTCLOUD_VERSION 28.0.3
ENV AIO_TOKEN 123456
ENV AIO_URL localhost
COPY supervisord.conf /supervisord.conf
# AIO settings end # Do not remove or change this line!
COPY --chmod=775 *.sh /
COPY --chmod=774 upgrade.exclude /upgrade.exclude
COPY config/*.php /
COPY supervisord.conf /supervisord.conf
VOLUME /mnt/ncdata
VOLUME /var/www/html
@@ -53,6 +58,7 @@ RUN set -ex; \
; \
\
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
docker-php-ext-configure ftp --with-openssl-dir=/usr; \
docker-php-ext-configure ldap; \
docker-php-ext-install -j "$(nproc)" \
bcmath \
@@ -115,6 +121,7 @@ RUN set -ex; \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www; \
\
# Download Nextcloud archive start # Do not remove or change this line!
apk add --no-cache --virtual .fetch-deps \
bzip2 \
gnupg \
@@ -135,8 +142,9 @@ RUN set -ex; \
mkdir -p /usr/src/nextcloud/custom_apps; \
chmod +x /usr/src/nextcloud/occ; \
mkdir -p /usr/src/nextcloud/config; \
mv /*.php /usr/src/nextcloud/config/; \
apk del .fetch-deps; \
# Download Nextcloud archive end # Do not remove or change this line!
mv /*.php /usr/src/nextcloud/config/; \
\
# Template from https://github.com/nextcloud/docker/blob/master/.examples/dockerfiles/full/fpm-alpine/Dockerfile
apk add --no-cache \
@@ -162,6 +170,7 @@ RUN set -ex; \
bz2 \
imap \
pgsql \
ftp \
; \
pecl install smbclient; \
docker-php-ext-enable smbclient; \
@@ -204,18 +213,20 @@ RUN set -ex; \
sed -i 's/^pm.max_children =.*/pm.max_children = 5000/' /usr/local/etc/php-fpm.d/www.conf; \
sed -i 's|access.log = /proc/self/fd/2|access.log = /proc/self/fd/1|' /usr/local/etc/php-fpm.d/docker.conf; \
\
# AIO cloning start # Do not remove or change this line!
rm -rf /tmp/nextcloud-aio && \
mkdir -p /tmp/nextcloud-aio && \
cd /tmp/nextcloud-aio && \
git clone https://github.com/nextcloud-releases/all-in-one.git --depth 1 .; \
mkdir -p /usr/src/nextcloud/apps/nextcloud-aio; \
cp -r ./app/* /usr/src/nextcloud/apps/nextcloud-aio/; \
# AIO cloning end # Do not remove or change this line!
\
chown www-data:root -R /usr/src && \
chown www-data:root -R /usr/local/etc/php/conf.d && \
chown www-data:root -R /usr/local/etc/php-fpm.d && \
chmod -R 777 /tmp; \
rm -r /usr/src/nextcloud/apps/updatenotification; \
rm -rf /usr/src/nextcloud/apps/updatenotification; \
\
mkdir -p /nc-updater; \
chown -R www-data:www-data /nc-updater; \

View File

@@ -12,5 +12,5 @@ $CONFIG = array (
'writable' => true,
),
),
'appsallowlist' => getenv('APPS_ALLOWLIST') ? explode(" ", getenv('APPS_ALLOWLIST')) : [],
'appsallowlist' => getenv('APPS_ALLOWLIST') ? explode(" ", getenv('APPS_ALLOWLIST')) : false,
);

View File

@@ -55,9 +55,9 @@ if [ -f /var/www/html/version.php ]; then
else
installed_version="0.0.0.0"
fi
if [ -f "/usr/src/nextcloud/version.php" ]; then
if [ -f "$SOURCE_LOCATION/version.php" ]; then
# shellcheck disable=SC2016
image_version="$(php -r 'require "/usr/src/nextcloud/version.php"; echo implode(".", $OC_Version);')"
image_version="$(php -r "require '$SOURCE_LOCATION/version.php'; echo implode('.', \$OC_Version);")"
else
image_version="$installed_version"
fi
@@ -106,6 +106,8 @@ if ! [ -f "$NEXTCLOUD_DATA_DIR/skip.update" ]; then
fi
if [ "$installed_version" != "0.0.0.0" ] && [ "$((IMAGE_MAJOR - INSTALLED_MAJOR))" -gt 1 ]; then
# Do not skip major versions placeholder # Do not remove or change this line!
# Do not skip major versions start # Do not remove or change this line!
set -ex
NEXT_MAJOR="$((INSTALLED_MAJOR + 1))"
curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/latest-${NEXT_MAJOR}.tar.bz2"
@@ -122,17 +124,18 @@ if ! [ -f "$NEXTCLOUD_DATA_DIR/skip.update" ]; then
mkdir -p /usr/src/tmp/nextcloud/data
mkdir -p /usr/src/tmp/nextcloud/custom_apps
chmod +x /usr/src/tmp/nextcloud/occ
cp -r /usr/src/nextcloud/config/* /usr/src/tmp/nextcloud/config/
cp -r "$SOURCE_LOCATION"/config/* /usr/src/tmp/nextcloud/config/
mkdir -p /usr/src/tmp/nextcloud/apps/nextcloud-aio
cp -r /usr/src/nextcloud/apps/nextcloud-aio/* /usr/src/tmp/nextcloud/apps/nextcloud-aio/
mv /usr/src/nextcloud /usr/src/temp-nextcloud
mv /usr/src/tmp/nextcloud /usr/src/nextcloud
cp -r "$SOURCE_LOCATION"/apps/nextcloud-aio/* /usr/src/tmp/nextcloud/apps/nextcloud-aio/
mv "$SOURCE_LOCATION" /usr/src/temp-nextcloud
mv /usr/src/tmp/nextcloud "$SOURCE_LOCATION"
rm -r /usr/src/tmp
rm -r /usr/src/temp-nextcloud
# shellcheck disable=SC2016
image_version="$(php -r 'require "/usr/src/nextcloud/version.php"; echo implode(".", $OC_Version);')"
image_version="$(php -r "require $SOURCE_LOCATION/version.php; echo implode('.', \$OC_Version);")"
IMAGE_MAJOR="${image_version%%.*}"
set +ex
# Do not skip major versions end # Do not remove or change this line!
fi
if [ "$installed_version" != "0.0.0.0" ]; then
@@ -186,15 +189,15 @@ if ! [ -f "$NEXTCLOUD_DATA_DIR/skip.update" ]; then
fi
echo "Initializing nextcloud $image_version ..."
rsync -rlD --delete --exclude-from=/upgrade.exclude /usr/src/nextcloud/ /var/www/html/
rsync -rlD --delete --exclude-from=/upgrade.exclude "$SOURCE_LOCATION/" /var/www/html/
for dir in config data custom_apps themes; do
if [ ! -d "/var/www/html/$dir" ] || directory_empty "/var/www/html/$dir"; then
rsync -rlD --include "/$dir/" --exclude '/*' /usr/src/nextcloud/ /var/www/html/
rsync -rlD --include "/$dir/" --exclude '/*' "$SOURCE_LOCATION/" /var/www/html/
fi
done
rsync -rlD --delete --include '/config/' --exclude '/*' --exclude '/config/CAN_INSTALL' --exclude '/config/config.sample.php' --exclude '/config/config.php' /usr/src/nextcloud/ /var/www/html/
rsync -rlD --include '/version.php' --exclude '/*' /usr/src/nextcloud/ /var/www/html/
rsync -rlD --delete --include '/config/' --exclude '/*' --exclude '/config/CAN_INSTALL' --exclude '/config/config.sample.php' --exclude '/config/config.php' "$SOURCE_LOCATION/" /var/www/html/
rsync -rlD --include '/version.php' --exclude '/*' "$SOURCE_LOCATION/" /var/www/html/
echo "Initializing finished"
#install
@@ -255,6 +258,7 @@ DATADIR_PERMISSION_CONF
# unset admin password
unset ADMIN_PASSWORD
# AIO update to latest start # Do not remove or change this line!
if [ "$INSTALL_LATEST_MAJOR" = yes ]; then
php /var/www/html/occ config:system:set updatedirectory --value="/nc-updater"
INSTALLED_AT="$(php /var/www/html/occ config:app:get core installedat)"
@@ -292,6 +296,7 @@ DATADIR_PERMISSION_CONF
php /var/www/html/occ db:add-missing-primary-keys
yes | php /var/www/html/occ db:convert-filecache-bigint
fi
# AIO update to latest end # Do not remove or change this line!
# Apply log settings
echo "Applying default settings..."
@@ -322,6 +327,8 @@ DATADIR_PERMISSION_CONF
# Apply other settings
echo "Applying other settings..."
# Add missing indices after new installation because they seem to be missing on new installation
php /var/www/html/occ db:add-missing-indices
php /var/www/html/occ config:system:set upgrade.disable-web --type=bool --value=true
php /var/www/html/occ config:system:set mail_smtpmode --value="smtp"
php /var/www/html/occ config:system:set trashbin_retention_obligation --value="auto, 30"
@@ -463,11 +470,13 @@ if [ -f "$NEXTCLOUD_DATA_DIR/fingerprint.update" ]; then
rm "$NEXTCLOUD_DATA_DIR/fingerprint.update"
fi
# AIO one-click settings start # Do not remove or change this line!
# Apply one-click-instance settings
echo "Applying one-click-instance settings..."
php /var/www/html/occ config:system:set one-click-instance --value=true --type=bool
php /var/www/html/occ config:system:set one-click-instance.user-limit --value=100 --type=int
php /var/www/html/occ config:system:set one-click-instance.link --value="https://nextcloud.com/all-in-one/"
# AIO one-click settings end # Do not remove or change this line!
php /var/www/html/occ app:enable support
if [ -n "$SUBSCRIPTION_KEY" ] && [ -z "$(php /var/www/html/occ config:app:get support potential_subscription_key)" ]; then
php /var/www/html/occ config:app:set support potential_subscription_key --value="$SUBSCRIPTION_KEY"
@@ -483,6 +492,10 @@ php /var/www/html/occ config:system:set updatedirectory --value="/nc-updater"
if [ -n "$SERVERINFO_TOKEN" ] && [ -z "$(php /var/www/html/occ config:app:get serverinfo token)" ]; then
php /var/www/html/occ config:app:set serverinfo token --value="$SERVERINFO_TOKEN"
fi
# Set maintenance window so that no warning is shown in the admin overview
if [ -z "$(php /var/www/html/occ config:system:get maintenance_window_start)" ]; then
php /var/www/html/occ config:system:set maintenance_window_start --type=int --value=100
fi
# Apply network settings
echo "Applying network settings..."
@@ -503,6 +516,7 @@ else
php /var/www/html/occ config:system:set files_external_allow_create_new_local --type=bool --value=true
fi
# AIO app start # Do not remove or change this line!
# AIO app
if [ "$THIS_IS_AIO" = "true" ]; then
if [ "$(php /var/www/html/occ config:app:get nextcloud-aio enabled)" != "yes" ]; then
@@ -513,6 +527,7 @@ else
php /var/www/html/occ app:disable nextcloud-aio
fi
fi
# AIO app end # Do not remove or change this line!
# Notify push
if ! [ -d "/var/www/html/custom_apps/notify_push" ]; then
@@ -690,6 +705,7 @@ fi
if [ "$IMAGINARY_ENABLED" = 'yes' ]; then
php /var/www/html/occ config:system:set enabledPreviewProviders 0 --value="OC\\Preview\\Imaginary"
php /var/www/html/occ config:system:set preview_imaginary_url --value="http://$IMAGINARY_HOST:9000"
php /var/www/html/occ config:system:set preview_imaginary_key --value="$IMAGINARY_SECRET"
else
if [ -n "$(php /var/www/html/occ config:system:get preview_imaginary_url)" ]; then
php /var/www/html/occ config:system:delete enabledPreviewProviders 0

View File

@@ -1,3 +1,4 @@
# syntax=docker/dockerfile:latest
FROM alpine:3.19.1
COPY --chmod=775 start.sh /start.sh

View File

@@ -1,5 +1,6 @@
# syntax=docker/dockerfile:latest
# From https://github.com/ONLYOFFICE/Docker-DocumentServer/blob/master/Dockerfile
FROM onlyoffice/documentserver:7.5.1.1
FROM onlyoffice/documentserver:8.0.1.1
# USER root is probably used

View File

@@ -1,5 +1,6 @@
# syntax=docker/dockerfile:latest
# From https://github.com/docker-library/postgres/blob/master/15/alpine/Dockerfile
FROM postgres:15.5-alpine
FROM postgres:15.6-alpine
COPY --chmod=775 start.sh /start.sh
COPY --chmod=775 healthcheck.sh /healthcheck.sh

View File

@@ -1,3 +1,4 @@
# syntax=docker/dockerfile:latest
# From https://github.com/docker-library/redis/blob/master/7.0/alpine/Dockerfile
FROM redis:7.2.4-alpine

View File

@@ -1,4 +1,5 @@
FROM python:3.12.1-alpine3.19
# syntax=docker/dockerfile:latest
FROM python:3.12.2-alpine3.19
COPY --chmod=775 start.sh /start.sh

View File

@@ -1,4 +1,5 @@
FROM nats:2.10.10-scratch as nats
# syntax=docker/dockerfile:latest
FROM nats:2.10.11-scratch as nats
FROM eturnal/eturnal:1.12.0 AS eturnal
FROM strukturag/nextcloud-spreed-signaling:1.2.3 as signaling
FROM alpine:3.19.1 as janus

View File

@@ -1,3 +1,4 @@
# syntax=docker/dockerfile:latest
# From https://github.com/containrrr/watchtower/blob/main/dockerfiles/Dockerfile.self-contained
FROM containrrr/watchtower:1.7.1 as watchtower

View File

@@ -5,7 +5,7 @@
<name>Nextcloud All-in-One</name>
<summary>Provides a login link for admins.</summary>
<description>Add a link to the admin settings that gives access to the Nextcloud All-in-One admin interface</description>
<version>0.4.0</version>
<version>0.5.0</version>
<licence>agpl</licence>
<author>Azul</author>
<namespace>AllInOne</namespace>
@@ -13,7 +13,7 @@
<category>monitoring</category>
<bugs>https://github.com/nextcloud/all-in-one/issues</bugs>
<dependencies>
<nextcloud min-version="26" max-version="27"/>
<nextcloud min-version="27" max-version="28"/>
</dependencies>
<settings>

View File

@@ -1,5 +1,5 @@
## Caddy with geoblocking
This container bundles caddy and auto-configures it for you. It also covers https://github.com/nextcloud/all-in-one/tree/main/community-containers/vaultwarden by listening on `bw.$NC_DOMAIN`, if installed. It also covers https://github.com/nextcloud/all-in-one/tree/main/community-containers/stalwart by listening on `mail.$NC_DOMAIN`, if installed.
This container bundles caddy and auto-configures it for you. It also covers https://github.com/nextcloud/all-in-one/tree/main/community-containers/vaultwarden by listening on `bw.$NC_DOMAIN`, if installed. It also covers https://github.com/nextcloud/all-in-one/tree/main/community-containers/stalwart by listening on `mail.$NC_DOMAIN`, if installed. It also covers https://github.com/nextcloud/all-in-one/tree/main/community-containers/jellyfin by listening on `media.$NC_DOMAIN`, if installed.
### Notes
- This container is incompatible with the [npmplus](https://github.com/nextcloud/all-in-one/tree/main/community-containers/npmplus) community container. So make sure that you do not enable both at the same time!
@@ -7,6 +7,7 @@ This container bundles caddy and auto-configures it for you. It also covers http
- If you want to use this with https://github.com/nextcloud/all-in-one/tree/main/community-containers/vaultwarden, make sure that you point `bw.your-nc-domain.com` to your server using a cname record so that caddy can get a certificate automatically for vaultwarden.
- If you want to use this with https://github.com/nextcloud/all-in-one/tree/main/community-containers/stalwart, make sure that you point `mail.your-nc-domain.com` to your server using a cname record so that caddy can get a certificate automatically for stalwart.
- After the container was started the first time, you should see a new `nextcloud-aio-caddy` folder and inside there an `allowed-countries.txt` file when you open the files app with the default `admin` user. In there you can adjust the allowed country codes for caddy by adding them to the first line, e.g. `IT FR` would allow access from italy and france. Private ip-ranges are always allowed. Additionally, in order to activate this config, you need to get an account at https://dev.maxmind.com/geoip/geolite2-free-geolocation-data and download the `GeoLite2-Country.mmdb` and upload it with this exact name into the `nextcloud-aio-caddy` folder. Afterwards restart all containers from the AIO interface and your new config should be active!
- You can add your own Caddy configurations in `/data/caddy-imports/` inside the Caddy container (`sudo docker exec -it nextcloud-aio-caddy bash`). These will be imported on container startup.
- See https://github.com/nextcloud/all-in-one/tree/main/community-containers#community-containers how to add it to the AIO stack
### Repository

View File

@@ -0,0 +1,39 @@
{
"aio_services_v1": [
{
"container_name": "nextcloud-aio-jellyfin",
"display_name": "Jellyfin",
"documentation": "https://github.com/nextcloud/all-in-one/tree/main/community-containers/jellyfin",
"image": "jellyfin/jellyfin",
"image_tag": "latest",
"internal_port": "host",
"restart": "unless-stopped",
"environment": [
"TZ=%TIMEZONE%"
],
"volumes": [
{
"source": "nextcloud_aio_jellyfin",
"destination": "/config",
"writeable": true
},
{
"source": "%NEXTCLOUD_DATADIR%",
"destination": "/media",
"writeable": false
},
{
"source": "%NEXTCLOUD_MOUNT%",
"destination": "%NEXTCLOUD_MOUNT%",
"writeable": false
}
],
"devices": [
"/dev/dri"
],
"backup_volumes": [
"nextcloud_aio_jellyfin"
]
}
]
}

View File

@@ -0,0 +1,18 @@
## Jellyfin
This container bundles Jellyfin and auto-configures it for you.
### Notes
- This container is incompatible with the [Plex](https://github.com/nextcloud/all-in-one/tree/main/community-containers/plex) community container. So make sure that you do not enable both at the same time!
- This container does not work on Docker Desktop since it needs `network_mode: host` in order to work correctly.
- After adding and starting the container, you can directly visit http://ip.address.of.server:8096/ and access your new Jellyfin instance!
- In order to access your Jellyfin outside the local network, you have to set up your own reverse proxy. You can set up a reverse proxy following [these instructions](https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md) and [Jellyfin's networking documentation](https://jellyfin.org/docs/general/networking/#running-jellyfin-behind-a-reverse-proxy), OR use the [Caddy](https://github.com/nextcloud/all-in-one/tree/main/community-containers/caddy) community container that will automatically configure `media.$NC_DOMAIN` to redirect to your Jellyfin.
- ⚠️ After the initial start, Jellyfin shows a configuration page to set up the root password, etc. **Be careful to initialize your Jellyfin before adding the DNS record.**
- The data of Jellyfin will be automatically included in AIO's backup solution!
- See [here](https://github.com/nextcloud/all-in-one/tree/main/community-containers#community-containers) how to add it to the AIO stack.
### Repository
https://github.com/jellyfin/jellyfin
### Maintainer
https://github.com/airopi

View File

@@ -5,7 +5,7 @@
"display_name": "Local AI",
"documentation": "https://github.com/nextcloud/all-in-one/tree/main/community-containers/local-ai",
"image": "szaimen/aio-local-ai",
"image_tag": "v1",
"image_tag": "v2",
"internal_port": "8080",
"restart": "unless-stopped",
"environment": [

View File

@@ -2,7 +2,8 @@
This container bundles Local AI and auto-configures it for you.
### Notes
- Make sure to have enough storage space available. This container alone needs ~14GB storage on x64, on arm64 only ~4GB. Every model that you add to `models.yaml` will of course use additional space which adds up quite fast.
- This container does not work on arm64! If you add the container on arm64, it will fail to start because no image for arm64 is available!
- Make sure to have enough storage space available. This container alone needs ~14GB storage. Every model that you add to `models.yaml` will of course use additional space which adds up quite fast.
- After the container was started the first time, you should see a new `nextcloud-aio-local-ai` folder when you open the files app with the default `admin` user. In there you should see a `models.yaml` config file. You can now add models in there. Please refer [here](https://github.com/go-skynet/model-gallery/blob/main/index.yaml) where you can get further urls that you can put in there. Afterwards restart all containers from the AIO interface and the models should automatically get downloaded by the local-ai container and activated.
- Example for content of `models.yaml` (if you add all of them, it takes around 10GB additional space):
```yaml

View File

@@ -6,7 +6,7 @@ This container bundles pi-hole and auto-configures it for you.
- Make sure that no dns server is already running by checking with `sudo netstat -tulpn | grep 53`. Otherwise the container will not be able to start!
- The DHCP functionality of Pi-hole has been disabled!
- The data of pi-hole will be automatically included in AIOs backup solution!
- After adding and starting the container, you can visit `http://ip.address.of.this.server:8573` in order to log in with the admin key that you can retrieve when running `sudo docker inspect nextcloud-aio-pihole | grep WEBPASSWORD`. There you can configure the pi-hole setup. Also you can add local dns records.
- After adding and starting the container, you can visit `http://ip.address.of.this.server:8573/admin` in order to log in with the admin key that you can retrieve when running `sudo docker inspect nextcloud-aio-pihole | grep WEBPASSWORD`. There you can configure the pi-hole setup. Also you can add local dns records.
- You can configure your home network now to use pi-hole as its dns server by configuring your router.
- Additionally, you can configure the docker daemon to use that by editing `/etc/docker/daemon.json` and adding ` { "dns" : [ "ip.address.of.this.server" , "8.8.8.8" ] } `.
- See https://github.com/nextcloud/all-in-one/tree/main/community-containers#community-containers how to add it to the AIO stack

View File

@@ -2,6 +2,7 @@
This container bundles Plex and auto-configures it for you.
### Notes
- This container is incompatible with the [Jellyfin](https://github.com/nextcloud/all-in-one/tree/main/community-containers/jellyfin) community container. So make sure that you do not enable both at the same time!
- This is not working on arm64 since Plex does only provide x64 docker images.
- This is not working on Docker Desktop since it needs `network_mode: host` in order to work correctly.
- If you have a firewall like ufw configured, you might need to open all Plex ports in there first in order to make it work. Especially port 32400 is important!

View File

@@ -45,6 +45,8 @@ services:
- /usr/local/apache2/logs
- /tmp
- /home/www-data
cap_drop:
- NET_RAW
nextcloud-aio-database:
image: nextcloud/aio-postgresql:latest
@@ -68,6 +70,8 @@ services:
read_only: true
tmpfs:
- /var/run/postgresql
cap_drop:
- NET_RAW
nextcloud-aio-nextcloud:
depends_on:
@@ -149,6 +153,8 @@ services:
restart: unless-stopped
networks:
- nextcloud-aio
cap_drop:
- NET_RAW
nextcloud-aio-notify-push:
image: nextcloud/aio-notify-push:latest
@@ -170,6 +176,8 @@ services:
networks:
- nextcloud-aio
read_only: true
cap_drop:
- NET_RAW
nextcloud-aio-redis:
image: nextcloud/aio-redis:latest
@@ -185,6 +193,8 @@ services:
networks:
- nextcloud-aio
read_only: true
cap_drop:
- NET_RAW
nextcloud-aio-collabora:
image: nextcloud/aio-collabora:latest
@@ -205,6 +215,8 @@ services:
- nextcloud-aio
cap_add:
- MKNOD
cap_drop:
- NET_RAW
nextcloud-aio-talk:
image: nextcloud/aio-talk:latest
@@ -234,6 +246,8 @@ services:
- /opt/eturnal/run
- /conf
- /tmp
cap_drop:
- NET_RAW
nextcloud-aio-talk-recording:
image: nextcloud/aio-talk-recording:latest
@@ -255,6 +269,8 @@ services:
tmpfs:
- /tmp
- /conf
cap_drop:
- NET_RAW
nextcloud-aio-clamav:
image: nextcloud/aio-clamav:latest
@@ -276,6 +292,8 @@ services:
- /var/lock
- /var/log/clamav
- /tmp
cap_drop:
- NET_RAW
nextcloud-aio-onlyoffice:
image: nextcloud/aio-onlyoffice:latest
@@ -294,6 +312,8 @@ services:
- onlyoffice
networks:
- nextcloud-aio
cap_drop:
- NET_RAW
nextcloud-aio-imaginary:
image: nextcloud/aio-imaginary:latest
@@ -305,6 +325,8 @@ services:
restart: unless-stopped
cap_add:
- SYS_NICE
cap_drop:
- NET_RAW
profiles:
- imaginary
networks:
@@ -336,6 +358,8 @@ services:
- fulltextsearch
networks:
- nextcloud-aio
cap_drop:
- NET_RAW
volumes:
nextcloud_aio_apache:

View File

@@ -33,7 +33,7 @@ The procedure for migrating the files and the database works like this:
```
1. Create a new database by running:
```
export PG_USER="ncadmin"
export PG_USER="ncadmin" # This is a temporary user that gets created for the dump but is then overwritten by the correct one later on
export PG_PASSWORD="my-temporary-password"
export PG_DATABASE="nextcloud_db"
sudo -u postgres psql <<END
@@ -68,7 +68,8 @@ The procedure for migrating the files and the database works like this:
1. Change it to look like this: `local::/mnt/ncdata/`.
1. Now save the file by pressing `[CTRL] + [o]` then `[ENTER]` and close nano by pressing `[CTRL] + [x]`
1. In order to make sure that everything is good, you can now run `grep "/your/old/datadir" database-dump.sql` which should not bring up further results.<br>
1. **Please note:** Unfortunately it is not possible to import a database dump from a former database owner with the name `nextcloud`. You can check if that is the case with this command: `grep "Name: oc_appconfig; Type: TABLE; Schema: public; Owner:" database-dump.sql | grep -oP 'Owner:.*$' | sed 's|Owner:||;s| ||g'`. If it returns `nextcloud`, you need to rename the owner in the dump file manually. A command like the following should work, however please note that it is possible that it will overwrite wrong lines. You can thus first check which lines it will change with `grep "Owner: nextcloud$" database-dump.sql`. If only correct looking lines get returned, feel free to change them with `sed -i 's|Owner: nextcloud$|Owner: ncadmin|' database-dump.sql`.
1. **Please note:** Unfortunately it is not possible to import a database dump from a former database owner with the name `nextcloud`. You can check if that is the case with this command: `grep "Name: oc_appconfig; Type: TABLE; Schema: public; Owner:" database-dump.sql | grep -oP 'Owner:.*$' | sed 's|Owner:||;s| ||g'`. If it returns `nextcloud`, you need to rename the owner in the dump file manually. A command like the following should work, however please note that it is possible that it will overwrite wrong lines. You can thus first check which lines it will change with `grep "Owner: nextcloud$" database-dump.sql`. If only correct looking lines get returned, feel free to change them with `sed -i 's|Owner: nextcloud$|Owner: ncadmin|' database-dump.sql`.
The same applies for the second statement, check with `grep " OWNER TO nextcloud;$" database-dump.sql` and replace with `sed -i 's| OWNER TO nextcloud;$| OWNER TO ncadmin;|' database-dump.sql`.
1. Next, copy the database dump into the correct place and prepare the database container which will import from the database dump automatically the next container start:
```
sudo docker run --rm --volume nextcloud_aio_database_dump:/mnt/data:rw alpine rm /mnt/data/database-dump.sql

View File

@@ -1,6 +1,6 @@
name: nextcloud-aio-helm-chart
description: A generated Helm Chart for Nextcloud AIO from Skippbox Kompose
version: 7.12.0-beta
version: 7.13.1
apiVersion: v2
keywords:
- latest

View File

@@ -2,21 +2,23 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-apache
name: nextcloud-aio-apache
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
replicas: 1
selector:
matchLabels:
io.kompose.service: nextcloud-aio-apache
strategy:
type: Recreate
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.network/nextcloud-aio: "true"
@@ -59,14 +61,17 @@ spec:
value: nextcloud-aio-talk
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-apache:beta
imagePullPolicy: Always
image: nextcloud/aio-apache:20240308_092935-latest
name: nextcloud-aio-apache
ports:
- containerPort: {{ .Values.APACHE_PORT }}
protocol: TCP
- containerPort: {{ .Values.APACHE_PORT }}
protocol: UDP
securityContext:
capabilities:
drop:
- NET_RAW
volumeMounts:
- mountPath: /var/www/html
name: nextcloud-aio-nextcloud

View File

@@ -4,7 +4,7 @@ metadata:
labels:
io.kompose.service: nextcloud-aio-apache
name: nextcloud-aio-apache
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
{{- if .Values.STORAGE_CLASS }}
storageClassName: {{ .Values.STORAGE_CLASS }}

View File

@@ -2,12 +2,12 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-apache
name: nextcloud-aio-apache
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
ipFamilyPolicy: PreferDualStack
type: LoadBalancer

View File

@@ -3,21 +3,23 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-clamav
name: nextcloud-aio-clamav
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
replicas: 1
selector:
matchLabels:
io.kompose.service: nextcloud-aio-clamav
strategy:
type: Recreate
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.network/nextcloud-aio: "true"
@@ -50,11 +52,15 @@ spec:
value: "90"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-clamav:20240201_120631-latest
image: nextcloud/aio-clamav:20240308_092935-latest
name: nextcloud-aio-clamav
ports:
- containerPort: 3310
protocol: TCP
securityContext:
capabilities:
drop:
- NET_RAW
volumeMounts:
- mountPath: /var/lib/clamav
subPath: data

View File

@@ -5,7 +5,7 @@ metadata:
labels:
io.kompose.service: nextcloud-aio-clamav
name: nextcloud-aio-clamav
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
{{- if .Values.STORAGE_CLASS }}
storageClassName: {{ .Values.STORAGE_CLASS }}

View File

@@ -3,12 +3,12 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-clamav
name: nextcloud-aio-clamav
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
ipFamilyPolicy: PreferDualStack
ports:

View File

@@ -3,12 +3,12 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-collabora
name: nextcloud-aio-collabora
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
replicas: 1
selector:
@@ -17,7 +17,7 @@ spec:
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.network/nextcloud-aio: "true"
@@ -37,7 +37,7 @@ spec:
value: --o:ssl.enable=false --o:ssl.termination=true --o:mount_jail_tree=false --o:logging.level=warning --o:home_mode.enable=true {{ .Values.COLLABORA_SECCOMP_POLICY }} --o:remote_font_config.url=https://{{ .Values.NC_DOMAIN }}/apps/richdocuments/settings/fonts.json
- name: server_name
value: "{{ .Values.NC_DOMAIN }}"
image: nextcloud/aio-collabora:20240201_120631-latest
image: nextcloud/aio-collabora:20240308_092935-latest
name: nextcloud-aio-collabora
ports:
- containerPort: 9980
@@ -46,4 +46,6 @@ spec:
capabilities:
add:
- MKNOD
drop:
- NET_RAW
{{- end }}

View File

@@ -3,12 +3,12 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-collabora
name: nextcloud-aio-collabora
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
ipFamilyPolicy: PreferDualStack
ports:

View File

@@ -2,21 +2,23 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-database
name: nextcloud-aio-database
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
replicas: 1
selector:
matchLabels:
io.kompose.service: nextcloud-aio-database
strategy:
type: Recreate
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.network/nextcloud-aio: "true"
@@ -61,11 +63,15 @@ spec:
value: nextcloud
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-postgresql:20240201_120631-latest
image: nextcloud/aio-postgresql:20240308_092935-latest
name: nextcloud-aio-database
ports:
- containerPort: 5432
protocol: TCP
securityContext:
capabilities:
drop:
- NET_RAW
volumeMounts:
- mountPath: /var/lib/postgresql/data
subPath: data

View File

@@ -4,7 +4,7 @@ metadata:
labels:
io.kompose.service: nextcloud-aio-database-dump
name: nextcloud-aio-database-dump
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
{{- if .Values.STORAGE_CLASS }}
storageClassName: {{ .Values.STORAGE_CLASS }}

View File

@@ -4,7 +4,7 @@ metadata:
labels:
io.kompose.service: nextcloud-aio-database
name: nextcloud-aio-database
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
{{- if .Values.STORAGE_CLASS }}
storageClassName: {{ .Values.STORAGE_CLASS }}

View File

@@ -2,12 +2,12 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-database
name: nextcloud-aio-database
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
ipFamilyPolicy: PreferDualStack
ports:

View File

@@ -1,10 +1,11 @@
{{- if eq .Values.FULLTEXTSEARCH_ENABLED "yes" }}
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
labels:
io.kompose.service: nextcloud-aio-elasticsearch
name: nextcloud-aio-elasticsearch
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
{{- if .Values.STORAGE_CLASS }}
storageClassName: {{ .Values.STORAGE_CLASS }}
@@ -14,3 +15,4 @@ spec:
resources:
requests:
storage: {{ .Values.ELASTICSEARCH_STORAGE_SIZE }}
{{- end }}

View File

@@ -3,21 +3,23 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-fulltextsearch
name: nextcloud-aio-fulltextsearch
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
replicas: 1
selector:
matchLabels:
io.kompose.service: nextcloud-aio-fulltextsearch
strategy:
type: Recreate
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.network/nextcloud-aio: "true"
@@ -55,11 +57,15 @@ spec:
value: basic
- name: xpack.security.enabled
value: "false"
image: nextcloud/aio-fulltextsearch:20240201_120631-latest
image: nextcloud/aio-fulltextsearch:20240308_092935-latest
name: nextcloud-aio-fulltextsearch
ports:
- containerPort: 9200
protocol: TCP
securityContext:
capabilities:
drop:
- NET_RAW
volumeMounts:
- mountPath: /usr/share/elasticsearch/data
name: nextcloud-aio-elasticsearch

View File

@@ -3,12 +3,12 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-fulltextsearch
name: nextcloud-aio-fulltextsearch
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
ipFamilyPolicy: PreferDualStack
ports:

View File

@@ -3,12 +3,12 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-imaginary
name: nextcloud-aio-imaginary
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
replicas: 1
selector:
@@ -17,7 +17,7 @@ spec:
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.network/nextcloud-aio: "true"
@@ -27,7 +27,7 @@ spec:
- env:
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-imaginary:20240201_120631-latest
image: nextcloud/aio-imaginary:20240308_092935-latest
name: nextcloud-aio-imaginary
ports:
- containerPort: 9000
@@ -36,4 +36,6 @@ spec:
capabilities:
add:
- SYS_NICE
drop:
- NET_RAW
{{- end }}

View File

@@ -3,12 +3,12 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-imaginary
name: nextcloud-aio-imaginary
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
ipFamilyPolicy: PreferDualStack
ports:

View File

@@ -1,5 +1,7 @@
{{- if ne .Values.NAMESPACE "default" }}
apiVersion: v1
kind: Namespace
metadata:
name: {{ .Values.NAMESPACE }}
namespace: {{ .Values.NAMESPACE }}
name: "{{ .Values.NAMESPACE }}"
namespace: "{{ .Values.NAMESPACE }}"
{{- end }}

View File

@@ -4,7 +4,7 @@ metadata:
labels:
io.kompose.service: nextcloud-aio-nextcloud-data
name: nextcloud-aio-nextcloud-data
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
{{- if .Values.STORAGE_CLASS }}
storageClassName: {{ .Values.STORAGE_CLASS }}

View File

@@ -2,21 +2,23 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-nextcloud
name: nextcloud-aio-nextcloud
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
replicas: 1
selector:
matchLabels:
io.kompose.service: nextcloud-aio-nextcloud
strategy:
type: Recreate
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.network/nextcloud-aio: "true"
@@ -158,14 +160,17 @@ spec:
value: "{{ .Values.TIMEZONE }}"
- name: UPDATE_NEXTCLOUD_APPS
value: "{{ .Values.UPDATE_NEXTCLOUD_APPS }}"
image: nextcloud/aio-nextcloud:beta
imagePullPolicy: Always
image: nextcloud/aio-nextcloud:20240308_092935-latest
name: nextcloud-aio-nextcloud
ports:
- containerPort: 9000
protocol: TCP
- containerPort: 9001
protocol: TCP
securityContext:
capabilities:
drop:
- NET_RAW
volumeMounts:
- mountPath: /var/www/html
name: nextcloud-aio-nextcloud

View File

@@ -4,7 +4,7 @@ metadata:
labels:
io.kompose.service: nextcloud-aio-nextcloud
name: nextcloud-aio-nextcloud
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
{{- if .Values.STORAGE_CLASS }}
storageClassName: {{ .Values.STORAGE_CLASS }}

View File

@@ -2,12 +2,12 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-nextcloud
name: nextcloud-aio-nextcloud
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
ipFamilyPolicy: PreferDualStack
ports:

View File

@@ -4,7 +4,7 @@ metadata:
labels:
io.kompose.service: nextcloud-aio-nextcloud-trusted-cacerts
name: nextcloud-aio-nextcloud-trusted-cacerts
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
{{- if .Values.STORAGE_CLASS }}
storageClassName: {{ .Values.STORAGE_CLASS }}

View File

@@ -2,21 +2,23 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-notify-push
name: nextcloud-aio-notify-push
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
replicas: 1
selector:
matchLabels:
io.kompose.service: nextcloud-aio-notify-push
strategy:
type: Recreate
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.network/nextcloud-aio: "true"
@@ -50,11 +52,15 @@ spec:
value: nextcloud-aio-redis
- name: REDIS_HOST_PASSWORD
value: "{{ .Values.REDIS_PASSWORD }}"
image: nextcloud/aio-notify-push:20240201_120631-latest
image: nextcloud/aio-notify-push:20240308_092935-latest
name: nextcloud-aio-notify-push
ports:
- containerPort: 7867
protocol: TCP
securityContext:
capabilities:
drop:
- NET_RAW
volumeMounts:
- mountPath: /nextcloud
name: nextcloud-aio-nextcloud

View File

@@ -2,12 +2,12 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-notify-push
name: nextcloud-aio-notify-push
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
ipFamilyPolicy: PreferDualStack
ports:

View File

@@ -3,21 +3,23 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-onlyoffice
name: nextcloud-aio-onlyoffice
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
replicas: 1
selector:
matchLabels:
io.kompose.service: nextcloud-aio-onlyoffice
strategy:
type: Recreate
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.network/nextcloud-aio: "true"
@@ -43,11 +45,15 @@ spec:
value: "{{ .Values.ONLYOFFICE_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-onlyoffice:20240201_120631-latest
image: nextcloud/aio-onlyoffice:20240308_092935-latest
name: nextcloud-aio-onlyoffice
ports:
- containerPort: 80
protocol: TCP
securityContext:
capabilities:
drop:
- NET_RAW
volumeMounts:
- mountPath: /var/lib/onlyoffice
name: nextcloud-aio-onlyoffice

View File

@@ -5,7 +5,7 @@ metadata:
labels:
io.kompose.service: nextcloud-aio-onlyoffice
name: nextcloud-aio-onlyoffice
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
{{- if .Values.STORAGE_CLASS }}
storageClassName: {{ .Values.STORAGE_CLASS }}

View File

@@ -3,12 +3,12 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-onlyoffice
name: nextcloud-aio-onlyoffice
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
ipFamilyPolicy: PreferDualStack
ports:

View File

@@ -2,21 +2,23 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-redis
name: nextcloud-aio-redis
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
replicas: 1
selector:
matchLabels:
io.kompose.service: nextcloud-aio-redis
strategy:
type: Recreate
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.network/nextcloud-aio: "true"
@@ -38,11 +40,15 @@ spec:
value: "{{ .Values.REDIS_PASSWORD }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-redis:20240201_120631-latest
image: nextcloud/aio-redis:20240308_092935-latest
name: nextcloud-aio-redis
ports:
- containerPort: 6379
protocol: TCP
securityContext:
capabilities:
drop:
- NET_RAW
volumeMounts:
- mountPath: /data
name: nextcloud-aio-redis

View File

@@ -4,7 +4,7 @@ metadata:
labels:
io.kompose.service: nextcloud-aio-redis
name: nextcloud-aio-redis
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
{{- if .Values.STORAGE_CLASS }}
storageClassName: {{ .Values.STORAGE_CLASS }}

View File

@@ -2,12 +2,12 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-redis
name: nextcloud-aio-redis
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
ipFamilyPolicy: PreferDualStack
ports:

View File

@@ -3,12 +3,12 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-talk
name: nextcloud-aio-talk
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
replicas: 1
selector:
@@ -17,7 +17,7 @@ spec:
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.network/nextcloud-aio: "true"
@@ -37,7 +37,7 @@ spec:
value: "{{ .Values.TURN_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-talk:20240201_120631-latest
image: nextcloud/aio-talk:20240308_092935-latest
name: nextcloud-aio-talk
ports:
- containerPort: {{ .Values.TALK_PORT }}
@@ -46,4 +46,8 @@ spec:
protocol: UDP
- containerPort: 8081
protocol: TCP
securityContext:
capabilities:
drop:
- NET_RAW
{{- end }}

View File

@@ -3,12 +3,12 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-talk-recording
name: nextcloud-aio-talk-recording
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
replicas: 1
selector:
@@ -17,7 +17,7 @@ spec:
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.network/nextcloud-aio: "true"
@@ -33,9 +33,13 @@ spec:
value: "{{ .Values.RECORDING_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-talk-recording:20240201_120631-latest
image: nextcloud/aio-talk-recording:20240308_092935-latest
name: nextcloud-aio-talk-recording
ports:
- containerPort: 1234
protocol: TCP
securityContext:
capabilities:
drop:
- NET_RAW
{{- end }}

View File

@@ -3,12 +3,12 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-talk-recording
name: nextcloud-aio-talk-recording
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
ipFamilyPolicy: PreferDualStack
ports:

View File

@@ -4,12 +4,12 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-talk
name: nextcloud-aio-talk-public
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
ipFamilyPolicy: PreferDualStack
type: LoadBalancer
@@ -29,12 +29,12 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-talk
name: nextcloud-aio-talk
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
ipFamilyPolicy: PreferDualStack
ports:

View File

@@ -160,7 +160,7 @@ for variable in "${DEPLOYMENTS[@]}"; do
fi
done
# shellcheck disable=SC1083
find ./ -name '*.yaml' -exec sed -i "s|nextcloud-aio-namespace|\{\{ .Values.NAMESPACE \}\}|" \{} \;
find ./ -name '*.yaml' -exec sed -i 's|nextcloud-aio-namespace|"\{\{ .Values.NAMESPACE \}\}"|' \{} \;
# shellcheck disable=SC1083
find ./ -name '*service.yaml' -exec sed -i "/^status:/,$ d" \{} \;
# shellcheck disable=SC1083
@@ -214,14 +214,14 @@ find ./ -name '*service.yaml' -exec sed -i "/^spec:/a\ \ ipFamilyPolicy: PreferD
# shellcheck disable=SC1083
find ./ -name '*.yaml' -exec sed -i "s|'{{|\"{{|g;s|}}'|}}\"|g" \{} \;
# shellcheck disable=SC1083
find ./ -name '*.yaml' -exec sed -i "/type: Recreate/d" \{} \;
# shellcheck disable=SC1083
find ./ -name '*.yaml' -exec sed -i "/strategy:/d" \{} \;
# shellcheck disable=SC1083
find ./ \( -not -name '*service.yaml' -name '*.yaml' \) -exec sed -i "/^status:/d" \{} \;
# shellcheck disable=SC1083
find ./ \( -not -name '*persistentvolumeclaim.yaml' -name '*.yaml' \) -exec sed -i "/resources:/d" \{} \;
# shellcheck disable=SC1083
find ./ -name "*namespace.yaml" -exec sed -i "1i\\{{- if ne .Values.NAMESPACE \"default\" }}" \{} \;
# shellcheck disable=SC1083
find ./ -name "*namespace.yaml" -exec sed -i "$ a {{- end }}" \{} \;
# shellcheck disable=SC1083
find ./ -name '*.yaml' -exec sed -i "/creationTimestamp: null/d" \{} \;
VOLUMES="$(find ./ -name '*persistentvolumeclaim.yaml' | sed 's|-persistentvolumeclaim.yaml||g;s|.*nextcloud-aio-||g' | sort)"
mapfile -t VOLUMES <<< "$VOLUMES"
@@ -350,6 +350,12 @@ for variable in "${ENABLED_VARIABLES[@]}"; do
find ./ -name "*nextcloud-aio-$name-persistentvolumeclaim.yaml" -exec sed -i "$ a {{- end }}" \{} \;
done
# Additional case for FTS volume
# shellcheck disable=SC1083
find ./ -name "*nextcloud-aio-elasticsearch-persistentvolumeclaim.yaml" -exec sed -i "1i\\{{- if eq .Values.FULLTEXTSEARCH_ENABLED \"yes\" }}" \{} \;
# shellcheck disable=SC1083
find ./ -name "*nextcloud-aio-elasticsearch-persistentvolumeclaim.yaml" -exec sed -i "$ a {{- end }}" \{} \;
chmod 777 -R ./
# Seems like the dir needs to match the name of the chart

View File

@@ -5,7 +5,7 @@
}
},
"require": {
"php": "8.2.*",
"php": "8.3.*",
"ext-json": "*",
"ext-sodium": "*",
"ext-curl": "*",
@@ -22,6 +22,6 @@
"psalm": "psalm --threads=1",
"psalm:update-baseline": "psalm --threads=1 --update-baseline",
"lint": "find . -name \\*.php -not -path './vendor/*' -exec php -l {} \\;",
"php-deprecation-detector": "find . -name \\*.php -not -path './vendor/*' -exec phpdd scan {} -n -t 8.2 \\;"
"php-deprecation-detector": "find . -name \\*.php -not -path './vendor/*' -exec phpdd scan {} -n -t 8.3 \\;"
}
}

28
php/composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "b0074cfbf6b5cde6d6d2207286ad2e85",
"content-hash": "4dcdd3b6df3f2041895d4db74bd45102",
"packages": [
{
"name": "guzzlehttp/guzzle",
@@ -1148,16 +1148,16 @@
},
{
"name": "slim/slim",
"version": "4.12.0",
"version": "4.13.0",
"source": {
"type": "git",
"url": "https://github.com/slimphp/Slim.git",
"reference": "e9e99c2b24398b967841c6c4c3048622cc7e2b18"
"reference": "038fd5713d5a41636fdff0e8dcceedecdd17fc17"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/slimphp/Slim/zipball/e9e99c2b24398b967841c6c4c3048622cc7e2b18",
"reference": "e9e99c2b24398b967841c6c4c3048622cc7e2b18",
"url": "https://api.github.com/repos/slimphp/Slim/zipball/038fd5713d5a41636fdff0e8dcceedecdd17fc17",
"reference": "038fd5713d5a41636fdff0e8dcceedecdd17fc17",
"shasum": ""
},
"require": {
@@ -1166,7 +1166,7 @@
"php": "^7.4 || ^8.0",
"psr/container": "^1.0 || ^2.0",
"psr/http-factory": "^1.0",
"psr/http-message": "^1.1",
"psr/http-message": "^1.1 || ^2.0",
"psr/http-server-handler": "^1.0",
"psr/http-server-middleware": "^1.0",
"psr/log": "^1.1 || ^2.0 || ^3.0"
@@ -1174,19 +1174,19 @@
"require-dev": {
"adriansuter/php-autoload-override": "^1.4",
"ext-simplexml": "*",
"guzzlehttp/psr7": "^2.5",
"guzzlehttp/psr7": "^2.6",
"httpsoft/http-message": "^1.1",
"httpsoft/http-server-request": "^1.1",
"laminas/laminas-diactoros": "^2.17",
"laminas/laminas-diactoros": "^2.17 || ^3",
"nyholm/psr7": "^1.8",
"nyholm/psr7-server": "^1.0",
"phpspec/prophecy": "^1.17",
"phpspec/prophecy-phpunit": "^2.0",
"nyholm/psr7-server": "^1.1",
"phpspec/prophecy": "^1.19",
"phpspec/prophecy-phpunit": "^2.1",
"phpstan/phpstan": "^1.10",
"phpunit/phpunit": "^9.6",
"slim/http": "^1.3",
"slim/psr7": "^1.6",
"squizlabs/php_codesniffer": "^3.7"
"squizlabs/php_codesniffer": "^3.9"
},
"suggest": {
"ext-simplexml": "Needed to support XML format in BodyParsingMiddleware",
@@ -1259,7 +1259,7 @@
"type": "tidelift"
}
],
"time": "2023-07-23T04:54:29+00:00"
"time": "2024-03-03T21:25:30+00:00"
},
{
"name": "slim/twig-view",
@@ -1788,7 +1788,7 @@
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
"php": "8.2.*",
"php": "8.3.*",
"ext-json": "*",
"ext-sodium": "*",
"ext-curl": "*",

View File

@@ -31,6 +31,13 @@
"pattern": "^[A-Z_]+$"
}
},
"cap_drop": {
"type": "array",
"items": {
"type": "string",
"pattern": "^[A-Z_]+$"
}
},
"depends_on": {
"type": "array",
"items": {

View File

@@ -65,6 +65,9 @@
"/usr/local/apache2/logs",
"/tmp",
"/home/www-data"
],
"cap_drop": [
"NET_RAW"
]
},
{
@@ -112,6 +115,9 @@
"read_only": true,
"tmpfs": [
"/var/run/postgresql"
],
"cap_drop": [
"NET_RAW"
]
},
{
@@ -140,7 +146,8 @@
"NEXTCLOUD_PASSWORD",
"TURN_SECRET",
"SIGNALING_SECRET",
"FULLTEXTSEARCH_PASSWORD"
"FULLTEXTSEARCH_PASSWORD",
"IMAGINARY_SECRET"
],
"volumes": [
{
@@ -214,7 +221,8 @@
"APACHE_PORT=%APACHE_PORT%",
"APACHE_IP_BINDING=%APACHE_IP_BINDING%",
"ADDITIONAL_TRUSTED_PROXY=%CADDY_IP_ADDRESS%",
"THIS_IS_AIO=true"
"THIS_IS_AIO=true",
"IMAGINARY_SECRET=%IMAGINARY_SECRET%"
],
"stop_grace_period": 600,
"restart": "unless-stopped",
@@ -226,6 +234,9 @@
],
"networks": [
"nextcloud-aio"
],
"cap_drop": [
"NET_RAW"
]
},
{
@@ -263,7 +274,10 @@
"networks": [
"nextcloud-aio"
],
"read_only": true
"read_only": true,
"cap_drop": [
"NET_RAW"
]
},
{
"container_name": "nextcloud-aio-redis",
@@ -295,7 +309,10 @@
"networks": [
"nextcloud-aio"
],
"read_only": true
"read_only": true,
"cap_drop": [
"NET_RAW"
]
},
{
"container_name": "nextcloud-aio-collabora",
@@ -328,6 +345,9 @@
],
"cap_add": [
"MKNOD"
],
"cap_drop": [
"NET_RAW"
]
},
{
@@ -380,6 +400,9 @@
"/opt/eturnal/run",
"/conf",
"/tmp"
],
"cap_drop": [
"NET_RAW"
]
},
{
@@ -414,6 +437,9 @@
"tmpfs": [
"/tmp",
"/conf"
],
"cap_drop": [
"NET_RAW"
]
},
{
@@ -472,6 +498,9 @@
"cap_add": [
"SYS_ADMIN"
],
"cap_drop": [
"NET_RAW"
],
"apparmor_unconfined": true,
"read_only": true,
"tmpfs": [
@@ -494,7 +523,10 @@
"writeable": false
}
],
"read_only": true
"read_only": true,
"cap_drop": [
"NET_RAW"
]
},
{
"container_name": "nextcloud-aio-domaincheck",
@@ -521,6 +553,9 @@
"tmpfs": [
"/etc/lighttpd",
"/var/www/domaincheck"
],
"cap_drop": [
"NET_RAW"
]
},
{
@@ -556,6 +591,9 @@
"/var/lock",
"/var/log/clamav",
"/tmp"
],
"cap_drop": [
"NET_RAW"
]
},
{
@@ -594,6 +632,9 @@
],
"networks": [
"nextcloud-aio"
],
"cap_drop": [
"NET_RAW"
]
},
{
@@ -607,12 +648,16 @@
],
"internal_port": "9000",
"environment": [
"TZ=%TIMEZONE%"
"TZ=%TIMEZONE%",
"IMAGINARY_SECRET=%IMAGINARY_SECRET%"
],
"restart": "unless-stopped",
"cap_add": [
"SYS_NICE"
],
"cap_drop": [
"NET_RAW"
],
"profiles": [
"imaginary"
],
@@ -622,6 +667,9 @@
"read_only": true,
"tmpfs": [
"/tmp"
],
"secrets": [
"IMAGINARY_SECRET"
]
},
{
@@ -662,6 +710,9 @@
],
"secrets": [
"FULLTEXTSEARCH_PASSWORD"
],
"cap_drop": [
"NET_RAW"
]
},
{
@@ -685,6 +736,9 @@
"read_only": true,
"tmpfs": [
"/tmp"
],
"cap_drop": [
"NET_RAW"
]
}
]

View File

@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="5.21.1@8c473e2437be8b6a8fd8f630f0f11a16b114c494"/>
<files psalm-version="5.22.2@d768d914152dbbf3486c36398802f74e80cfde48"/>

View File

@@ -48,6 +48,15 @@ class DockerController
}
}
// Check if docker hub is reachable in order to make sure that we do not try to pull an image if it is down
// and try to mitigate issues that are arising due to that
if ($pullImage) {
if (!$this->dockerActionManager->isDockerHubReachable($container)) {
$pullImage = false;
error_log('Not pulling the image for the ' . $container->GetContainerName() . ' container because docker hub does not seem to be reachable.');
}
}
$this->dockerActionManager->DeleteContainer($container);
$this->dockerActionManager->CreateVolumes($container);
if ($pullImage) {

View File

@@ -186,7 +186,11 @@ class DockerActionManager
public function StartContainer(Container $container) : void {
$url = $this->BuildApiUrl(sprintf('containers/%s/start', urlencode($container->GetIdentifier())));
$this->guzzleClient->post($url);
try {
$this->guzzleClient->post($url);
} catch (RequestException $e) {
throw new \Exception("Could not start container " . $container->GetIdentifier() . ": " . $e->getMessage());
}
}
public function CreateVolumes(Container $container): void
@@ -562,6 +566,9 @@ class DockerActionManager
}
$mounts[] = ["Type" => "bind", "Source" => $volume->name, "Target" => $volume->mountPoint, "ReadOnly" => !$volume->isWritable, "BindOptions" => [ "Propagation" => "rshared"]];
}
// Special things for the caddy community container
} elseif ($container->GetIdentifier() === 'nextcloud-aio-caddy') {
$requestBody['HostConfig']['ExtraHosts'] = ['host.docker.internal:host-gateway'];
}
if (count($mounts) > 0) {
@@ -578,11 +585,26 @@ class DockerActionManager
]
);
} catch (RequestException $e) {
throw new \Exception("Could not start container " . $container->GetIdentifier() . ": " . $e->getMessage());
throw new \Exception("Could not create container " . $container->GetIdentifier() . ": " . $e->getMessage());
}
}
public function isDockerHubReachable(Container $container) : bool {
$tag = $container->GetImageTag();
if ($tag === '%AIO_CHANNEL%') {
$tag = $this->GetCurrentChannel();
}
$remoteDigest = $this->dockerHubManager->GetLatestDigestOfTag($container->GetContainerName(), $tag);
if ($remoteDigest === null) {
return false;
} else {
return true;
}
}
public function PullImage(Container $container) : void
{
$imageName = $this->BuildImageName($container);

View File

@@ -16,7 +16,7 @@
</header>
<div class="content">
<h1>Nextcloud AIO v7.12.1</h1>
<h1>Nextcloud AIO v8.0.0</h1>
{# Add 2nd tab warning #}
<script type="text/javascript" src="second-tab-warning.js"></script>
@@ -28,7 +28,7 @@
{% set isBackupOrRestoreRunning = false %}
{% set isApacheStarting = false %}
{# Setting newMajorVersion to '' will hide corresponding options/elements, can be set to an integer like 26 in order to show corresponding elements. If set, also increase installLatestMajor in https://github.com/nextcloud/all-in-one/blob/main/php/src/Controller/DockerController.php #}
{% set newMajorVersion = 28 %}
{% set newMajorVersion = '' %}
{% if is_backup_container_running == true %}
{% if borg_backup_mode == 'backup' or borg_backup_mode == 'restore' %}

View File

@@ -103,7 +103,7 @@ The following instructions are meant for installations without a web server or r
<summary>Explanation of the command</summary>
- `sudo docker run` This command spins up a new docker container. Docker commands can optionally be used without `sudo` if the user is added to the docker group (this is not the same as docker rootless, see FAQ below).
- `--init` This option makes sure that no zombie-processes are created, ever. See https://docs.docker.com/engine/reference/run/#specify-an-init-process
- `--init` This option makes sure that no zombie-processes are created, ever. See [the Docker documentation](https://docs.docker.com/reference/cli/docker/container/run/#init).
- `--sig-proxy=false` This option allows to exit the container shell that gets attached automatically when using `docker run` by using `[CTRL] + [C]` without shutting down the container.
- `--name nextcloud-aio-mastercontainer` This is the name of the container. This line is not allowed to be changed, since mastercontainer updates would fail.
- `--restart always` This is the "restart policy". `always` means that the container should always get started with the Docker daemon. See the Docker documentation for further detail about restart policies: https://docs.docker.com/config/containers/start-containers-automatically/
@@ -688,6 +688,15 @@ After you are done modifying/adding/deleting files/folders, don't forget to appl
You can move the whole docker library and all its files including all Nextcloud AIO files and folders to a separate drive by first mounting the drive in the host OS (NTFS is not supported and ext4 is recommended as FS) and then following this tutorial: https://www.guguweb.com/2019/02/07/how-to-move-docker-data-directory-to-another-location-on-ubuntu/<br>
(Of course docker needs to be installed first for this to work.)
⚠️ If you encounter errors from richdocuments in your Nextcloud logs, check in your Collabora container if the message "Capabilities are not set for the coolforkit program." appears. If so, follow these steps:
1. Stop all the containers from the AIO Interface.
2. Go to your terminal and delete the Collabora container (`docker rm nextcloud-aio-collabora`) AND the Collabora image (`docker image rm nextcloud/aio-collabora`).
3. You might also want to prune your Docker (`docker system prune`) (no data will be lost).
4. Restart your containers from the AIO Interface.
This should solve the problem.
### How to edit Nextclouds config.php file with a texteditor?
You can edit Nextclouds config.php file directly from the host with your favorite text editor. E.g. like this: `sudo docker run -it --rm --volume nextcloud_aio_nextcloud:/var/www/html:rw alpine sh -c "apk add --no-cache nano && nano /var/www/html/config/config.php"`. Make sure to not break the file though which might corrupt your Nextcloud instance otherwise. In best case, create a backup using the built-in backup solution before editing the file.