Compare commits

..

1159 Commits

Author SHA1 Message Date
Simon L
cf148b6381 fix caddy warning
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-20 18:58:36 +02:00
Simon L
a117c684dd increase to 5.2.1
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-20 18:42:27 +02:00
Simon L
d5937d3990 Merge pull request #2569 from nextcloud/enh/noid/caddy-fix-syntax
caddy - a bugfix and some improvements
2023-05-20 18:41:24 +02:00
Simon L
a620640fa7 fix detail
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-20 18:41:12 +02:00
Simon L
c84091cc0c adjust things as discussed
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-20 18:36:43 +02:00
Simon L
0c945c9516 caddy - use correct syntax for trusted_proxies
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-19 20:58:06 +02:00
Simon L
ac7bf05f54 create important dirs beforehand
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-19 16:29:45 +02:00
Simon L
1dedc5f282 fix caddy config
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-19 16:06:22 +02:00
Simon L
08ff51c482 Merge pull request #2565 from nextcloud/enh/noid/fix-getallbackupvolumes
fix getAllBackupVolumes
2023-05-19 16:06:04 +02:00
Simon L
14a77ea88d fix getAllBackupVolumes
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-19 15:45:23 +02:00
Simon L
9388ec5798 increase to 5.2.0
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-19 14:18:02 +02:00
Simon L
1b878a4a8d adjust typo
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-19 14:15:49 +02:00
Simon L
1ceb963fae Merge pull request #2457 from nextcloud/enh/noid/add-caddy-imports
allow to add imports to the caddy file
2023-05-19 14:11:59 +02:00
Simon L
48e70e2b00 allow to add imports to the caddy file
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-19 14:07:22 +02:00
Simon L
4adb748970 Merge pull request #2490 from nextcloud/apache-dockerfile
optimze apache dockerfile
2023-05-19 13:39:01 +02:00
Simon L
10cfce7bdd Merge pull request #2455 from nextcloud/enh/noid/allow-to-include-in-backup-restore
allow to include volumes in backup and restore
2023-05-19 13:38:42 +02:00
Simon L
6cbab733be Merge pull request #2496 from nextcloud/mastercontainer-dockerfile
optimze mastercontainer Dockerfile
2023-05-19 13:33:04 +02:00
Simon L
9f19026885 allow to include volumes in backup and restore
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-19 13:28:17 +02:00
Simon L
1513d69a8d ipv6 - add note regarding problems with ipv6 and docker
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-16 17:49:39 +02:00
Simon L
364be594a2 fix missing character
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-16 16:28:01 +02:00
Simon L
4f30044d54 Merge pull request #2556 from nextcloud/aio-dependency-update
Dependency updates
2023-05-16 14:36:34 +02:00
szaimen
9f1b0e361d dependency updates
Signed-off-by: GitHub <noreply@github.com>
2023-05-16 12:25:19 +00:00
Simon L
fc352b84be Merge pull request #2550 from nextcloud/aio-dependency-update
Dependency updates
2023-05-15 10:15:23 +02:00
szaimen
c780f28c51 dependency updates
Signed-off-by: GitHub <noreply@github.com>
2023-05-14 12:02:13 +00:00
Zoey
f917f12932 move mastercontainer.conf to the end
Signed-off-by: Zoey <zoey@z0ey.de>
2023-05-12 18:00:33 +02:00
Zoey
3b4d741c8e put scripts into /
Signed-off-by: Zoey <zoey@z0ey.de>
2023-05-12 17:58:47 +02:00
Zoey
a0cf31ad1b put scripts into /
Signed-off-by: Zoey <zoey@z0ey.de>
2023-05-12 17:57:02 +02:00
Simon L
8c11f78940 Merge pull request #2548 from nextcloud/dependabot/docker/Containers/mastercontainer/php-8.2.6-fpm-alpine3.17
Bump php from 8.2.5-fpm-alpine3.17 to 8.2.6-fpm-alpine3.17 in /Containers/mastercontainer
2023-05-12 15:35:28 +02:00
Simon L
012d9a9392 Merge pull request #2547 from nextcloud/dependabot/docker/Containers/postgresql/postgres-15.3-alpine
Bump postgres from 15.2-alpine to 15.3-alpine in /Containers/postgresql
2023-05-12 15:34:56 +02:00
dependabot[bot]
9584ef5346 Bump php in /Containers/mastercontainer
Bumps php from 8.2.5-fpm-alpine3.17 to 8.2.6-fpm-alpine3.17.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-12 12:58:53 +00:00
dependabot[bot]
502f32f207 Bump postgres from 15.2-alpine to 15.3-alpine in /Containers/postgresql
Bumps postgres from 15.2-alpine to 15.3-alpine.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-12 12:58:50 +00:00
Simon L
cf9220c6b7 Merge pull request #2541 from steffenmalisi/feature/imaginary-port
Makes imaginary port configurable
2023-05-12 13:49:58 +02:00
steffenmalisi
7df7ee738c Prevents globbing and word splitting
Signed-off-by: steffenmalisi <steffenmalisi@users.noreply.github.com>
2023-05-12 12:50:59 +02:00
steffenmalisi
d95058ae21 Makes imaginary port configurable
Signed-off-by: steffenmalisi <steffenmalisi@users.noreply.github.com>
2023-05-12 12:50:59 +02:00
Simon L
3973943acd fix imaginary update workflow
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-12 12:50:10 +02:00
Simon L
692fd7e487 Merge pull request #2545 from sotnikov-link/patch-1
sudo docker volume prune --filter all=1
2023-05-11 23:33:49 +02:00
Valeriy Sotnikov
6ad9e9eda6 sudo docker volume prune --filter all=1
Signed-off-by: Valeriy Sotnikov <sotnikov.link@mail.ru>
2023-05-11 23:51:21 +03:00
Simon L
f2e4d8284c Merge pull request #2498 from nextcloud/postgres-dockerfile
optimize postgres Dockerfile
2023-05-11 14:22:29 +02:00
Zoey
b9709aa400 change script paths
Signed-off-by: Zoey <zoey@z0ey.de>
2023-05-11 14:17:54 +02:00
Zoey
d100bf985e move VOLUME and delete shadow
Signed-off-by: Zoey <zoey@z0ey.de>
2023-05-11 14:13:56 +02:00
Simon L
fafc456065 Merge pull request #2542 from nextcloud/aio-helm-update
Helm Chart updates
2023-05-11 11:48:37 +02:00
szaimen
bbeb7e2db2 Helm Chart updates
Signed-off-by: GitHub <noreply@github.com>
2023-05-11 09:48:01 +00:00
Simon L
285407e176 fix detail
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-11 11:47:36 +02:00
Simon L
f15b890b28 Merge pull request #2539 from nextcloud/enh/noid/fix-helm-chart-update
try to fix the helm-chart-update workflow
2023-05-11 11:44:59 +02:00
Simon L
2f2398c704 try to fix the helm-chart-update workflow
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-11 11:38:40 +02:00
Simon L
189728f765 Merge pull request #2520 from nextcloud/enh/noid/borg-enhancements
backup script - a few enhancements and safeguards
2023-05-11 10:08:32 +02:00
Simon L
c25587bcc3 Merge pull request #2519 from nextcloud/mastercontainer-root-check
add root user check for mastercontainer
2023-05-11 10:06:12 +02:00
Simon L
fa93f207eb Merge pull request #2536 from nextcloud/enh/noid/update-mastercontainer
update mastercontainer to php 8.2
2023-05-11 10:04:48 +02:00
Simon L
d5b5a1eae6 Merge pull request #2518 from nextcloud/dependabot/docker/Containers/collabora/collabora/code-22.05.14.3.1
Bump collabora/code from 22.05.13.1.1 to 22.05.14.3.1 in /Containers/collabora
2023-05-11 10:03:38 +02:00
Simon L
53f7fa70a0 Merge pull request #2528 from nextcloud/dependabot/docker/Containers/mastercontainer/docker-23.0.6-cli
Bump docker from 23.0.5-cli to 23.0.6-cli in /Containers/mastercontainer
2023-05-11 10:03:05 +02:00
Simon L
fceeb4be10 Merge pull request #2535 from nextcloud/enh/1992/add-coturn-version
add r0 to coturn version
2023-05-11 10:02:41 +02:00
dependabot[bot]
c6f49ee45c Bump docker from 23.0.5-cli to 23.0.6-cli in /Containers/mastercontainer
Bumps docker from 23.0.5-cli to 23.0.6-cli.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-11 08:00:56 +00:00
Simon L
8aa4c8a13e Merge pull request #2484 from nextcloud/aio-yaml-update
Yaml updates
2023-05-11 09:59:38 +02:00
Simon L
cd0b4cf1cc add a video on traefik configuration
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-10 23:22:14 +02:00
Simon L
72909bde64 update mastercontainer to php 8.2
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-10 20:44:07 +02:00
Simon L
1f6ab346a3 add r0 to coturn version
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-10 20:30:26 +02:00
Simon L
1f7f675454 add a section on Synology what to do if the socket could not be found
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-10 14:33:03 +02:00
szaimen
bd4afa7cff Yaml updates
Signed-off-by: GitHub <noreply@github.com>
2023-05-10 12:03:09 +00:00
Simon L
d1e781617c add detail to talk_port docs
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-09 16:21:42 +02:00
Zoey
40c3a24b8b Update Containers/mastercontainer/start.sh
Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Zoey <zoey@z0ey.de>
2023-05-09 11:17:39 +02:00
Simon L
9035f47611 backup script - a few enhancements and safeguards
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-09 00:54:15 +02:00
Zoey
a9960c8d6a add root user check for mastercontainer
Signed-off-by: Zoey <zoey@z0ey.de>
2023-05-08 22:59:47 +02:00
dependabot[bot]
616159c1b8 Bump collabora/code in /Containers/collabora
Bumps collabora/code from 22.05.13.1.1 to 22.05.14.3.1.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-08 12:59:44 +00:00
Simon L
45ec758e54 Merge pull request #2514 from iraklis10/patch-1
Update local-instance.md
2023-05-08 11:17:56 +02:00
iraklis10
6a300d03a6 Update local-instance.md
minor typo

Signed-off-by: iraklis10 <1414477+iraklis10@users.noreply.github.com>
2023-05-07 19:35:02 +01:00
Simon L
ef93976ba5 Merge pull request #2512 from nextcloud/automated/noid/psalm-baseline-update-1683259719
[Automated] Update psalm-baseline.xml
2023-05-05 08:03:36 +02:00
nextcloud-command
49e9c74a77 Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2023-05-05 04:08:39 +00:00
Simon L
9ba7962320 Merge pull request #2340 from JL102/main
Proxy instructions for NodeJS/express
2023-05-04 18:30:42 +02:00
Simon L
b08b59b39b fix initial options not showing up
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-04 15:38:11 +02:00
Simon L
8750bd343c mastercontainer needs to be connected before starting any other container
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-04 14:52:09 +02:00
Simon L
93cec3ca5b available check of .1 is sometimes apparently not enough when ipv6 is enabled
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-04 12:43:55 +02:00
Simon L
1a54b583c5 increase to 5.1.0
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-04 12:05:04 +02:00
Simon L
e30b0f878b adjust the docs a bit
Signed-off-by: Simon L <szaimen@e.mail.de>
Signed-off-by: JL102 <jordanlees@mailbox.org>
2023-05-03 21:26:44 -04:00
JL102
dcf83fafcc Proxy instructions for NodeJS/express
Signed-off-by: JL102 <jordanlees@mailbox.org>
2023-05-03 21:26:44 -04:00
Simon L
5667b989b9 improve detail
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-04 01:15:38 +02:00
Simon L
d87ae9d51b adjust wording a bit
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-04 00:44:37 +02:00
Zoey
a63ff97f43 improve ipv6 docs (#2504) 2023-05-04 00:38:28 +02:00
Simon L
944e09237c docker-compose - add an explanation why some settings are not to be changed
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-03 23:21:09 +02:00
Simon L
e0b0066f8a add a hint regarding docker run command
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-03 23:07:59 +02:00
Simon L
a69f6a3d39 add ipv6-advice as warning
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-03 18:45:06 +02:00
Simon L
a8bd3e8b97 Merge pull request #2483 from nextcloud/enh/noid/add-network-docker-compose
add internal network config to docker-compose file as well
2023-05-03 18:39:22 +02:00
Simon L
beffb879dc apply suggestions to manual-install network as well
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-03 18:38:42 +02:00
Simon L
a5d03e495e add suggestion
Signed-off-by: Simon L <szaimen@e.mail.de>

Co-authored-by: Zoey <zoey@z0ey.de>
Signed-off-by: Simon L. <szaimen@e.mail.de>
2023-05-03 18:38:08 +02:00
Simon L
17701ce256 apply suggestion
Signed-off-by: Simon L <szaimen@e.mail.de>

Co-authored-by: Zoey <zoey@z0ey.de>
Signed-off-by: Simon L. <szaimen@e.mail.de>
2023-05-03 18:34:17 +02:00
Simon L
dad3477a9f apply suggestion
Signed-off-by: Simon L <szaimen@e.mail.de>

Co-authored-by: Zoey <zoey@z0ey.de>
Signed-off-by: Simon L. <szaimen@e.mail.de>
2023-05-03 18:34:05 +02:00
Simon L
0d942935d8 Merge pull request #2470 from nextcloud/enh/noid/revert-disabling-fts
revert disabling FTS if on Nc26
2023-05-03 18:31:47 +02:00
Simon L
cffcf86fc9 Merge pull request #2481 from nextcloud/enh/noid/document-internal-ipv6-support
document how to enable ipv6 for the internal network
2023-05-03 18:27:47 +02:00
Simon L
6b15a2838a Add suggestion
Signed-off-by: Simon L <szaimen@e.mail.de>

Co-authored-by: Zoey <zoey@z0ey.de>
Signed-off-by: Simon L. <szaimen@e.mail.de>
2023-05-03 18:12:42 +02:00
Simon L
897f05ee0f add suggestion
Signed-off-by: Simon L <szaimen@e.mail.de>

Co-authored-by: Zoey <zoey@z0ey.de>
Signed-off-by: Simon L. <szaimen@e.mail.de>
2023-05-03 18:12:32 +02:00
Simon L
0fdcba047d manual-install - add an entry to the readme regarding ipv6
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-03 18:07:19 +02:00
Simon L
355381df1d Merge pull request #2485 from nextcloud/enh/noid/talk-lt-cred-mech
talk - remove lt-cred-mech as that is not recommended anymore
2023-05-03 18:02:47 +02:00
Simon L
e3cacb7811 Merge pull request #2489 from nextcloud/enh/noid/improve-template
twig templates - check for was_start_button_clicked instead of empty …
2023-05-03 18:02:29 +02:00
Simon L
ee3bc7b609 Merge pull request #2488 from nextcloud/enh/noid/speed-up-initial-login
try to speed up the initial login
2023-05-03 17:56:49 +02:00
Simon L
396fb671fe Merge pull request #2495 from nextcloud/elastic-dockerfile
optimze elastic Dockerfile
2023-05-03 17:55:42 +02:00
Zoey
73286c558c do not use ARG (2/2)
Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Zoey <zoey@z0ey.de>
2023-05-03 17:50:33 +02:00
Zoey
669555289c do not use ARG (1/2)
Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Zoey <zoey@z0ey.de>
2023-05-03 17:50:23 +02:00
Simon L
ff624fbfad Merge pull request #2502 from nextcloud/enh/noid/add-second-init-step
add a second init step for postgres
2023-05-03 17:47:25 +02:00
Simon L
93748f9644 add a second init step for postgres
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-03 17:46:46 +02:00
Simon L
bddca890c5 Merge pull request #2491 from nextcloud/borg-dockerfile
optimize borg dockerfile
2023-05-03 17:43:08 +02:00
Simon L
06d802fd43 apply suggestion
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-03 17:42:04 +02:00
Simon L
9e92f2b5fd Merge pull request #2501 from nextcloud/watchtower-dockerfile
optimze watchtower Dockerfile
2023-05-03 17:35:40 +02:00
Simon L
bc7d2a1337 use suggestion
Co-authored-by: Zoey <zoey@z0ey.de>
Signed-off-by: Simon L. <szaimen@e.mail.de>
2023-05-03 17:35:14 +02:00
Simon L
5f126583d3 Merge pull request #2500 from nextcloud/talk-dockerfile
optimize talk Dockerfile
2023-05-03 17:33:35 +02:00
Simon L
7c11a8a278 Update Containers/talk/Dockerfile
Signed-off-by: Simon L. <szaimen@e.mail.de>
2023-05-03 17:32:56 +02:00
Simon L
412da74702 Merge pull request #2499 from nextcloud/redis-dockerfile
optimize redis Dockerfile
2023-05-03 17:32:24 +02:00
Simon L
3e1ae33e95 Update Containers/redis/Dockerfile
Signed-off-by: Simon L. <szaimen@e.mail.de>
2023-05-03 17:31:43 +02:00
Simon L
9b8a547f71 Merge pull request #2494 from nextcloud/domaincheck-dockerfile
optimze domaincheck Dockerfile
2023-05-03 17:29:47 +02:00
Simon L
12d351aa19 apply suggestion
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-03 17:27:55 +02:00
Simon L
741d99d401 Merge pull request #2492 from nextcloud/clamav-dockerfile
optimize clamav Dockerfile
2023-05-03 17:26:32 +02:00
Zoey
fb45fa4073 add suggestion
Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Zoey <zoey@z0ey.de>
2023-05-03 17:11:18 +02:00
Zoey
55bc84d3f2 add set -ex
Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Zoey <zoey@z0ey.de>
2023-05-03 17:10:47 +02:00
Zoey
a4e894092c add suggestion
Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Zoey <zoey@z0ey.de>
2023-05-03 17:10:38 +02:00
Zoey
3fc1487cd9 update version in of source file
Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Zoey <zoey@z0ey.de>
2023-05-03 17:03:04 +02:00
Zoey
c9e406f76c add set -ex and remove tmp conf
Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Zoey <zoey@z0ey.de>
2023-05-03 17:02:43 +02:00
Zoey
234590f8ee add set -ex
Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Zoey <zoey@z0ey.de>
2023-05-03 17:02:07 +02:00
Zoey
85ac995907 undo version overwritte
Signed-off-by: Zoey <zoey@z0ey.de>
2023-05-03 16:57:57 +02:00
Zoey
079b86d840 optimze watchtower Dockerfile
Signed-off-by: Zoey <zoey@z0ey.de>
2023-05-03 16:38:40 +02:00
Zoey
132444cbb9 optimize talk Dockerfile
Signed-off-by: Zoey <zoey@z0ey.de>
2023-05-03 16:37:22 +02:00
Zoey
e4648ab03e optimize redis Dockerfile
Signed-off-by: Zoey <zoey@z0ey.de>
2023-05-03 16:36:29 +02:00
Zoey
1841733879 optimize postres Dockerfile
Signed-off-by: Zoey <zoey@z0ey.de>
2023-05-03 16:34:27 +02:00
Zoey
8bbdbd6fa7 optimze mastercontainer Dockerfile
Signed-off-by: Zoey <zoey@z0ey.de>
2023-05-03 16:31:32 +02:00
Zoey
f82818cbc6 optimze elastic Dockerfile
Signed-off-by: Zoey <zoey@z0ey.de>
2023-05-03 16:30:48 +02:00
Zoey
ca9b0cccf3 optimze domaincheck Dockerfile
Signed-off-by: Zoey <zoey@z0ey.de>
2023-05-03 16:29:25 +02:00
Zoey
fbc4b9cabb optimize clamav Dockerfile
Signed-off-by: Zoey <zoey@z0ey.de>
2023-05-03 16:27:52 +02:00
Zoey
c056879df4 optimize borg dockerfile
Signed-off-by: Zoey <zoey@z0ey.de>
2023-05-03 16:26:55 +02:00
Zoey
4a50fcf5a6 optimze apache dockerfile
Signed-off-by: Zoey <zoey@z0ey.de>
2023-05-03 16:25:03 +02:00
Simon L
0e09bb0d12 try to speed up the initial login
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-03 15:48:16 +02:00
Simon L
09e299181a twig templates - check for was_start_button_clicked instead of empty domain
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-03 15:32:45 +02:00
Simon L
844382d220 Merge pull request #2487 from nextcloud/dependabot/docker/Containers/fulltextsearch/elasticsearch-7.17.10
Bump elasticsearch from 7.17.9 to 7.17.10 in /Containers/fulltextsearch
2023-05-03 15:01:33 +02:00
Simon L
3c3c8fd8d5 Merge pull request #2486 from nextcloud/dependabot/docker/Containers/imaginary/golang-1.20.4-alpine3.17
Bump golang from 1.20.3-alpine3.17 to 1.20.4-alpine3.17 in /Containers/imaginary
2023-05-03 15:01:16 +02:00
dependabot[bot]
3b28885ee2 Bump elasticsearch from 7.17.9 to 7.17.10 in /Containers/fulltextsearch
Bumps elasticsearch from 7.17.9 to 7.17.10.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-03 13:00:36 +00:00
dependabot[bot]
b9ac7851b2 Bump golang in /Containers/imaginary
Bumps golang from 1.20.3-alpine3.17 to 1.20.4-alpine3.17.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-03 13:00:30 +00:00
Simon L
b2fa058f33 talk - remove lt-cred-mech as that is not recommended anymore
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-03 14:55:52 +02:00
Simon L
04f84bb9b1 add inspired by
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-03 13:52:33 +02:00
Simon L
14fd25c837 Merge pull request #2482 from nextcloud/enh/noid/remove-non-default-network-options
nextcloud-aio network - remove non-default options
2023-05-03 13:41:19 +02:00
Simon L
3ff0b2e987 add internal network config to docker-compose file as well
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-03 13:35:27 +02:00
Simon L
418e7898b7 nextcloud-aio network - remove non-default options
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-03 13:07:22 +02:00
Simon L
490e9571d1 document how to enable ipv6 for the internal network
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-03 13:05:27 +02:00
Simon L
b194450875 Merge pull request #2476 from nextcloud/enh/noid/manual-install-ipv6
manual-install - enable ipv6 by default
2023-05-03 13:03:51 +02:00
Simon L
1982e069b7 Merge pull request #2477 from nextcloud/enh/noid/create-data-folder
helm-chart - create the data folder manually in order to apply the co…
2023-05-03 13:01:49 +02:00
Simon L
26e3b14854 helm-chart - create the data folder manually in order to apply the correct permissions
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-03 13:01:37 +02:00
Simon L
347618f6a8 manual-install - enable ipv6 by default
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-03 12:07:21 +02:00
Simon L
ad8d6ab659 Merge pull request #2473 from nextcloud/automated/noid/psalm-baseline-update-1683086912
[Automated] Update psalm-baseline.xml
2023-05-03 07:59:15 +02:00
nextcloud-command
681f4ac73e Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2023-05-03 04:08:32 +00:00
Simon L
9f4b712f02 revert disabling FTS if on Nc26
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-02 20:35:28 +02:00
Simon L
9a27686ede Merge pull request #2459 from nextcloud/szaimen-patch-1
run composer during install as non-root user
2023-05-02 20:34:16 +02:00
Simon L
c5b26ffb4f Merge pull request #2467 from nextcloud/enh/noid/put-db-into-subpath
put the database into a subpath
2023-05-02 20:31:26 +02:00
Simon L
c6492ef05c put the database into a subpath
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-02 20:30:32 +02:00
Simon L
bf5b7f0f56 Merge pull request #2465 from nextcloud/dependabot/docker/Containers/clamav/clamav/clamav-1.1.0-1
Bump clamav/clamav from 1.0.1-2 to 1.1.0-1 in /Containers/clamav
2023-05-02 15:06:40 +02:00
Simon L
c153253c7f Merge pull request #2464 from nextcloud/aio-yaml-update
Yaml updates
2023-05-02 15:05:10 +02:00
dependabot[bot]
126db40a72 Bump clamav/clamav from 1.0.1-2 to 1.1.0-1 in /Containers/clamav
Bumps clamav/clamav from 1.0.1-2 to 1.1.0-1.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-02 13:01:31 +00:00
Simon L
d58bb56dfa add another known issue regarding cloudflare
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-02 14:44:07 +02:00
szaimen
e362ea8665 Yaml updates
Signed-off-by: GitHub <noreply@github.com>
2023-05-02 12:04:41 +00:00
Simon L
0dc630b5a9 run composer during install as non-root user
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-02 11:28:56 +02:00
Simon L
bc03d030c9 Merge pull request #2453 from wky0211/main
Fix typo in HTML template: changed "duckduckdns.org" to "duckdns.org"
2023-05-01 19:23:26 +02:00
Simon L
1304734d3e Merge pull request #2456 from nextcloud/enh/noid/update-schema
updaate regex for some values in containers schema
2023-05-01 19:10:23 +02:00
Simon L
8356e1aba1 updaate regex for some values in containers schema
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-01 19:06:13 +02:00
wky0211
900d470174 fix(typo): "duckduckdns.org" -> "duckdns.org"
Signed-off-by: wky0211 <46506352+wky0211@users.noreply.github.com>
2023-05-02 00:19:23 +08:00
Simon L
3d780a5a4d try to fix json validator workflow
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-01 16:58:44 +02:00
Simon L
e6d9099114 Merge pull request #2329 from esmith443/patch-1
RP docs - add Citrix ADC VPX / Citrix Netscaler
2023-05-01 16:55:59 +02:00
Simon L
cad77f8287 reorder alphabetically
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-01 16:49:16 +02:00
esmith443
4ef65b24ae Update reverse-proxy.md
Updated Commit to link to guide

Signed-off-by: esmith443 <119460913+esmith443@users.noreply.github.com>
2023-05-01 10:47:14 -04:00
esmith443
348d6acde7 Update reverse-proxy.md
Added guide for Citrix ADC VPX / Citrix Netscaler reverse proxy.
This is my first pull so I am sorry if I made any mistakes.
Love AIO thanks :)

Signed-off-by: esmith443 <119460913+esmith443@users.noreply.github.com>
2023-05-01 16:32:16 +02:00
Simon L
68e346047d Merge pull request #2446 from nextcloud/enh/noid/collabora-cert
collabora - make startup faster by not generating ssl cert
2023-05-01 15:22:39 +02:00
Simon L
77dee8caec Merge pull request #2432 from nextcloud/enh/noid/apparmor-unconfined
add apparmor_unconinfed to containers definition
2023-05-01 14:46:55 +02:00
Simon L
f861c66ade Merge pull request #2431 from nextcloud/enh/noid/decrease-size-mastercontainer
mastercontainer - delete things except the needed php dir
2023-05-01 14:39:22 +02:00
Simon L
046496c5fc Merge pull request #2429 from nextcloud/enh/1581/schema-regex
add patterns to containers-schema
2023-05-01 14:38:00 +02:00
Simon L
72d55cdbbf Merge pull request #2416 from nextcloud/enh/noid/adjust-button-focus
adjust the button color on focus
2023-05-01 14:37:24 +02:00
Simon L
9728a84e75 fix typo in forms.sh
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-01 14:35:57 +02:00
Simon L
27faed79d2 Merge pull request #2427 from nextcloud/enh/noid/krita
Krita should be enabled by default
2023-05-01 14:19:25 +02:00
Simon L
78419fa0a1 Merge pull request #2419 from nextcloud/szaimen-patch-1
add a hint where to look at in rp doc
2023-05-01 14:19:11 +02:00
Simon L
f540d54e2a Merge pull request #2451 from nextcloud/aio-helm-update
Helm Chart updates
2023-05-01 14:16:05 +02:00
szaimen
e78ef7a31a Helm Chart updates
Signed-off-by: GitHub <noreply@github.com>
2023-05-01 12:07:37 +00:00
Simon L
e44ef2d126 add a hint where to look at in rp doc
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-01 11:57:42 +02:00
Simon L
b2f5deebd2 Krita should be enabled by default
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-01 11:52:49 +02:00
Simon L
ccb97e9540 Merge pull request #2426 from nextcloud/dependabot/docker/Containers/mastercontainer/docker-23.0.5-cli
Bump docker from 23.0.4-cli to 23.0.5-cli in /Containers/mastercontainer
2023-05-01 11:52:02 +02:00
Simon L
861d717480 collabora - make startup faster by not generating ssl cert
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-01 11:17:36 +02:00
Simon L
792f4daf6d update php lint name
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-01 10:25:11 +02:00
Simon L
b349135dfb Merge pull request #2442 from nextcloud/enh/noid/twig-lint
add twig-lint
2023-05-01 10:19:13 +02:00
Simon L
eaf26a2ec3 add twig-lint
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-01 04:44:54 +02:00
Simon L
eeeeb2f37b add apparmor_unconinfed to containers definition
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-27 19:24:14 +02:00
Simon L
cc2c8998ba mastercontainer - delete things except the needed php dir
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-27 18:57:35 +02:00
Simon L
18f6aff016 add patterns to containers-schema
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-27 18:47:25 +02:00
Simon L
1118ba6764 add a passage about waiting for container to be bult before testing
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-27 15:19:22 +02:00
dependabot[bot]
070242cda8 Bump docker from 23.0.4-cli to 23.0.5-cli in /Containers/mastercontainer
Bumps docker from 23.0.4-cli to 23.0.5-cli.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-27 13:17:33 +00:00
Simon L
608fea6460 adjust workflows to add to review label automatically
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-27 15:16:58 +02:00
Simon L
7cb12f7893 make it even more verbose that the default command is not to be used behind a reverse proxy
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-27 10:35:01 +02:00
Simon L
454870ad49 Merge pull request #2422 from thijsvanderwoude/main
Fix minor typo
2023-04-26 08:55:56 +02:00
Thijs van der Woude
617c882015 Fix minor typo
Signed-off-by: Thijs van der Woude <31108288+thijsvanderwoude@users.noreply.github.com>
2023-04-26 01:28:12 +02:00
Simon L
306f1f45ec put mode into quotes
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-25 11:32:31 +02:00
Simon L
c590fb9592 change order of explanation
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-25 11:22:46 +02:00
Simon L
af91a01c04 Merge pull request #2418 from nextcloud/enh/noid/backup-include
put duplicated path examples into a dedicated include
2023-04-25 11:18:24 +02:00
Simon L
92616b6f9b Merge pull request #2417 from nextcloud/enh/noid/fix-stale-lock-removal
set BORG_HOST_ID to a fixed value in order to improve stale lock removal
2023-04-25 11:18:01 +02:00
Simon L
860f194d81 fix links
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-25 11:17:30 +02:00
Simon L
d8719e810c refactor aio-config section with visibility of links again.
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-25 11:13:36 +02:00
Simon L
1c6f2b80b7 add a dot to the end of sentence
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-25 11:13:05 +02:00
Simon L
0a48feb124 adjust wording a bit
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-25 11:08:41 +02:00
Simon L
97be96cde5 put duplicated path examples into a dedicated include
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-25 10:59:45 +02:00
Simon L
0779609bed set BORG_HOST_ID to a fixed value in order to fix stale lock removal
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-25 09:11:10 +02:00
Simon L
3bff5f2851 adjust the button color on focus
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-24 23:24:20 +02:00
Simon L
1d1d462bc0 fix spacing of aio-config
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-24 16:06:08 +02:00
Simon L
6debc29685 adjust a few breaks
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-24 16:01:04 +02:00
Simon L
8171d2c036 Merge pull request #2413 from nextcloud/enh/noid/details-tag-aio-password
put the aio password change into a details tag
2023-04-24 15:40:46 +02:00
Simon L
3cce13f2b8 put the aio password change into a details tag
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-24 15:40:28 +02:00
Simon L
c76e0aa1c1 fix some typos
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-24 15:36:41 +02:00
Simon L
14f5884e60 fix a link in the aio-config section
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-24 15:27:49 +02:00
Simon L
48746c24de adjust a few things in the aio-config section
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-24 15:24:50 +02:00
Simon L
c24709e2df fix details regarding backup description
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-24 15:15:53 +02:00
Simon L
359d43d3dd fix OO build
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-24 15:04:09 +02:00
Simon L
e95e2fdf9c increase to 5.0.0
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-24 14:49:19 +02:00
Simon L
628756da2b Merge pull request #2406 from nextcloud/enh/2402/aio-config
mention AIO config and docs in the AIO interface
2023-04-24 14:48:37 +02:00
Simon L
555ce650fd switch order of two elements
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-24 14:48:14 +02:00
Simon L
ea788daccc Merge pull request #2389 from nextcloud/enh/noid/domain-input
add additional notes to the first domain input
2023-04-24 14:46:12 +02:00
Simon L
a3cf552cf9 fix typo
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-24 13:31:03 +02:00
Simon L
5efcff80fe add a note on aio's operation mode
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-24 13:26:41 +02:00
Simon L
d908244ef0 fix typo
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-24 13:09:10 +02:00
Simon L
b77427b3cf improve dns record hint
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-24 13:08:36 +02:00
Simon L
acd0d82e29 substitute this documentation by correct names
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-24 13:04:32 +02:00
Simon L
378c884442 mention AIO config and docs in the AIO interface
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-22 11:59:58 +02:00
Simon L
de2503ad51 Merge pull request #2397 from nextcloud/enh/noid/add-print-red
add print_red in order to make the exact mistake more discoverable
2023-04-22 11:53:35 +02:00
Simon L
4e13dc5fca Merge pull request #2391 from nextcloud/enh/noid/helm-chart
add further docs on the helm-chart
2023-04-22 11:48:47 +02:00
Simon L
dae2da8494 Merge pull request #2408 from nextcloud/aio-helm-update
Helm Chart updates
2023-04-22 11:45:53 +02:00
szaimen
bdf45c7204 Helm Chart updates
Signed-off-by: GitHub <noreply@github.com>
2023-04-22 09:45:08 +00:00
Simon L
ff58ee08e7 add print_red in order to make the exact mistake more discoverable
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-22 11:44:06 +02:00
Simon L
07dc39c832 Merge pull request #2396 from nextcloud/enh/noid/improve-accepted-domains-feedback
add further domain validation feedback
2023-04-22 11:41:25 +02:00
Simon L
fe631e8a88 Merge pull request #2390 from nextcloud/enh/noid/manual-install-hint
add a hint to manual install when people did not grant access to the …
2023-04-22 11:40:31 +02:00
Simon L
ed92f9c138 Merge pull request #2385 from nextcloud/enh/noid/add-backup-retention-note
add a note on backup retention to the AIO interface
2023-04-22 11:39:43 +02:00
Simon L
7d288268bc Merge pull request #2388 from nextcloud/enh/noid/rename-spellling
rename `All In One` to `All-in-One`
2023-04-22 11:35:52 +02:00
Simon L
32d9cee2be Merge pull request #2383 from nextcloud/enh/noid/add-link-to-docs
add a note on what to do if Nexcloud does not open
2023-04-22 11:34:58 +02:00
Simon L
2ba096a1ab add daily backup hint also to AIO interface
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-22 11:34:34 +02:00
Simon L
08746f4aff Merge pull request #2384 from nextcloud/enh/noid/add-performance-docs
add a link to the performance documentation to the aio interface
2023-04-22 11:30:41 +02:00
Simon L
05db035919 add further line break after link
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-22 11:28:21 +02:00
Simon L
4ffed7e23c move the advice to the correct line
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-22 11:26:17 +02:00
Simon L
de9397ad54 Merge pull request #2376 from nextcloud/enh/noid/borg-advices
borg - add advices how to proceed if things get wrong
2023-04-22 11:25:00 +02:00
Simon L
74b4f1d395 Merge pull request #2357 from nextcloud/enh/noid/rename-docker-socket-path
rename `DOCKER_SOCKET_PATH` to `WATCHTOWER_DOCKER_SOCKET_PATH`
2023-04-22 11:24:00 +02:00
Simon L
37b5e12a6f rename DOCKER_SOCKET_PATH to WATCHTOWER_DOCKER_SOCKET_PATH
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-22 11:21:47 +02:00
Simon L
2260ccc876 Merge pull request #2358 from nextcloud/enh/noid/rename-disable-backup-section
rename `DISABLE_BACKUP_SECTION` to `AIO_DISABLE_BACKUP_SECTION`
2023-04-22 11:20:32 +02:00
Simon L
5a9e45ee6d rename DISABLE_BACKUP_SECTION to AIO_DISABLE_BACKUP_SECTION
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-22 11:15:51 +02:00
Simon L
f111363459 Merge pull request #2401 from nextcloud/nextcloud-container-update
Nextcloud update
2023-04-22 11:13:50 +02:00
Simon L
241041512f Merge pull request #2382 from nextcloud/dependabot/docker/Containers/redis/redis-7.0.11-alpine
Bump redis from 7.0.10-alpine to 7.0.11-alpine in /Containers/redis
2023-04-22 11:13:23 +02:00
Simon L
b20eec34e3 Merge pull request #2381 from nextcloud/dependabot/docker/Containers/mastercontainer/docker-23.0.4-cli
Bump docker from 23.0.3-cli to 23.0.4-cli in /Containers/mastercontainer
2023-04-22 11:13:10 +02:00
Simon L
3e0aa8a52d Merge pull request #2380 from nextcloud/dependabot/docker/Containers/talk/nats-2.9.16-scratch
Bump nats from 2.9.15-scratch to 2.9.16-scratch in /Containers/talk
2023-04-22 11:12:54 +02:00
Simon L
9f207810b8 Merge pull request #2377 from nextcloud/aio-dependency-update
Dependency updates
2023-04-22 11:12:37 +02:00
dependabot[bot]
4e6288b934 Bump docker from 23.0.3-cli to 23.0.4-cli in /Containers/mastercontainer
Bumps docker from 23.0.3-cli to 23.0.4-cli.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-22 09:11:51 +00:00
Simon L
31627f9270 Merge pull request #2369 from nextcloud/dependabot/docker/Containers/mastercontainer/php-8.1.18-fpm-alpine3.17
Bump php from 8.1.17-fpm-alpine3.17 to 8.1.18-fpm-alpine3.17 in /Containers/mastercontainer
2023-04-22 11:11:34 +02:00
Simon L
2af2e3a3cd Merge pull request #2368 from nextcloud/dependabot/docker/Containers/collabora/collabora/code-22.05.13.1.1
Bump collabora/code from 22.05.12.4.1 to 22.05.13.1.1 in /Containers/collabora
2023-04-22 11:11:10 +02:00
Simon L
6c4f7c22d3 Merge pull request #2355 from nextcloud/imaginary-container-update
Imaginary update
2023-04-22 11:09:27 +02:00
Simon L
05b5e41894 document where the chosen dir will be mounted
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-22 00:29:54 +02:00
Simon L
83c77d86e7 link to backup docs
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-22 00:26:13 +02:00
szaimen
f46c72b359 nextcloud-update automated change
Signed-off-by: GitHub <noreply@github.com>
2023-04-20 12:49:12 +00:00
szaimen
00f166675a imaginary-update automated change
Signed-off-by: GitHub <noreply@github.com>
2023-04-20 12:41:24 +00:00
szaimen
f12885b09b dependency updates
Signed-off-by: GitHub <noreply@github.com>
2023-04-20 12:06:37 +00:00
Simon L
1863078937 add missing peaces
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-20 00:11:50 +02:00
Simon L
e02be7234d Merge pull request #2400 from nextcloud/enh/noid/make-docu-verbose
make documentation more verbose how to apply environmental variabls t…
2023-04-19 23:44:33 +02:00
Simon L
cf10c495d1 make documentation more verbose how to apply environmental variabls to the container
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-19 23:42:38 +02:00
Simon L
90082704f6 adjust warning about /dev/dri device failure
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-19 20:54:10 +02:00
Simon L
838084f073 add further domain validation feedback
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-19 18:46:30 +02:00
Simon L
7373bb5960 talk about open/forwarded ports
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-19 18:44:43 +02:00
Simon L
38c95d14d2 make descriptions more explicit
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-19 18:44:04 +02:00
Simon L
4f7ee99782 add hint regarding RPs
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-19 18:28:58 +02:00
Simon L
aee32ed357 fix typo
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-19 12:01:14 +02:00
Simon L
6a4281fc12 add a sidenote for when the 10GB upload limit are a problem
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-19 11:45:43 +02:00
Simon L
1b46c172f0 Mark you need to know what you are doing as bold
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-19 11:31:10 +02:00
Simon L
b9bd1ecdc3 mark you need to know what you are doing as bold
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-19 11:30:18 +02:00
Simon L
c8783f79d6 adjust two things
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-19 01:17:27 +02:00
Simon L
45a33d4b5b adjust word
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-19 01:11:21 +02:00
Simon L
b94bb6569e add further backup details
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-19 00:57:08 +02:00
Simon L
be5b5deb7a additional bonus - apply patches
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-19 00:45:22 +02:00
Simon L
5550d30065 add three more included features
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-19 00:33:51 +02:00
Simon L
6b487302a8 Merge pull request #2393 from nextcloud/enh/noid/ipv6-docker-desktop
add ipv6 docs for Docker Desktop
2023-04-19 00:28:46 +02:00
Simon L
939c50726f add ipv6 docs for Docker Desktop
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-19 00:17:11 +02:00
Simon L
e8ce8d9dbf add further docs on the helm-chart
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-18 23:53:02 +02:00
Simon L
d37d21e151 Merge pull request #2392 from nextcloud/enh/2366/helm-chart
adut apache_max_size for helm-chart to be a string
2023-04-18 23:46:41 +02:00
Simon L
25b04bccdf adut apache_max_size for helm-chart to be a string
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-18 23:44:07 +02:00
Simon L
b3cc1644bb improve readability of And more
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-18 23:10:59 +02:00
Simon L
76841af339 add a link to the manual install directly from the docker socket description
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-18 23:08:34 +02:00
Simon L
1af8112308 add a hint to manual install when people did not grant access to the docker socket by purpose
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-18 23:07:04 +02:00
Simon L
57d9534133 add LDAP notice to much more section
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-18 22:56:24 +02:00
Simon L
a98e8c02d0 add additional notes to the first domain input
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-18 22:47:52 +02:00
Simon L
cb5bee70b0 Merge pull request #2387 from nextcloud/enh/noid/add-further-details
add a details tag to note down more included features
2023-04-18 22:27:56 +02:00
Simon L
66430a945d adjust the wording of cloudflare tunnel
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-18 22:26:22 +02:00
Simon L
324ed4dc63 add some screenshots
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-18 20:14:49 +02:00
Simon L
e0857cc954 add a details tag to note down more included features
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-18 20:14:49 +02:00
Simon L
87cb3cd819 rename All In One to All-in-One
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-18 19:07:59 +02:00
Simon L
52f4d4b41e add a note on backup retention to the AIO interface
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-18 15:51:17 +02:00
Simon L
566619ecac add a link to the performance documentation to the aio interface
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-18 15:41:43 +02:00
Simon L
b8379c81d7 add a note on what to do if Nexcloud does not open
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-18 15:38:27 +02:00
dependabot[bot]
38392e0dcf Bump redis from 7.0.10-alpine to 7.0.11-alpine in /Containers/redis
Bumps redis from 7.0.10-alpine to 7.0.11-alpine.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-18 12:59:40 +00:00
dependabot[bot]
c5fc60d1fa Bump nats from 2.9.15-scratch to 2.9.16-scratch in /Containers/talk
Bumps nats from 2.9.15-scratch to 2.9.16-scratch.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-18 12:59:29 +00:00
Simon L
87f97a5270 adjust formatting again
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-18 13:47:45 +02:00
Simon L
68af3916cb adjust command
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-18 13:41:20 +02:00
Simon L
6331a94758 rp docs - highlight what to do if host networking is not possible
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-18 13:25:09 +02:00
Simon L
3e2a64e6d4 borg - add advices how to proceed if things get wrong
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-18 13:22:10 +02:00
dependabot[bot]
cd4131a82d Bump php in /Containers/mastercontainer
Bumps php from 8.1.17-fpm-alpine3.17 to 8.1.18-fpm-alpine3.17.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-17 13:01:52 +00:00
dependabot[bot]
d1d66845a3 Bump collabora/code in /Containers/collabora
Bumps collabora/code from 22.05.12.4.1 to 22.05.13.1.1.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-17 13:01:11 +00:00
Simon L
8de8274a31 add three additional notes on debuggin things
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-16 22:02:56 +02:00
Simon L
ef82f1aaf9 Merge pull request #2362 from nextcloud/enh/noid/change-e-to-env
change `-e` to long syntax `--env`
2023-04-16 21:48:02 +02:00
Simon L
4b1ed4e227 change -e to long syntax --env
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-16 21:32:50 +02:00
Simon L
30883d0d61 add link how to configure things from scratch
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-16 21:30:18 +02:00
Simon L
f22117545f RP docs - adjust some additional details
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-16 21:25:23 +02:00
Simon L
512c134e11 a reload is likely not enough
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-16 21:15:51 +02:00
Simon L
3a438ff329 Merge pull request #2360 from nextcloud/enh/noid/adjust-rp-docs
adjust RP docs
2023-04-16 19:51:23 +02:00
Simon L
5c3e719e87 Merge pull request #2361 from nextcloud/enh/2319/adjust-npm-docs
adjust NPM docs
2023-04-16 19:46:50 +02:00
Simon L
cc3dc75917 adjust NPM docs
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-16 19:21:39 +02:00
Simon L
2ebfebf24a adjust RP docs
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-16 19:14:46 +02:00
Simon L
b566cd179e Merge pull request #2359 from nextcloud/enh/noid/add-ipv6-docs
add custom ipv6 docs
2023-04-16 18:58:09 +02:00
Simon L
2a44208f56 add custom ipv6 docs
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-16 18:35:04 +02:00
Simon L
46f4136d30 update volume prune documentation
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-15 18:03:50 +02:00
Simon L
fcf1a1e11b increase to 4.9.0
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-15 17:55:45 +02:00
Simon L
efd6f2a738 Merge pull request #2343 from nextcloud/enh/noid/update-run-twice
sometimes the built-in upgrader needs to run several times
2023-04-15 17:42:14 +02:00
Simon L
a145bf33a3 fix the formatting of the aio-app section
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-15 17:37:09 +02:00
Simon L
3873795c05 also add poppler for pdf support
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-15 17:00:21 +02:00
Simon L
edf723e4f4 fix typo
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-15 16:48:49 +02:00
Simon L
34239f3e15 also install other vips bindings
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-15 16:47:16 +02:00
Simon L
cf28ad7d45 run imaginary as nobody user
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-15 16:35:05 +02:00
Simon L
cda66b1a11 add set -ex to imaginary
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-15 12:56:14 +02:00
Simon L
1aa861ba2a Merge pull request #2344 from nextcloud/imaginary-container-update
Imaginary update
2023-04-15 12:54:45 +02:00
szaimen
085d878223 imaginary-update automated change
Signed-off-by: GitHub <noreply@github.com>
2023-04-15 10:53:31 +00:00
Simon L
f0069816bc sometimes the built-in upgrader needs to run several times
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-15 12:52:25 +02:00
Simon L
8babb33540 Merge pull request #2288 from nextcloud/imaginary-alpine
migrate imaginary container to alpine
2023-04-14 17:02:02 +02:00
Zoey
7f918c37fc fix typo
Signed-off-by: Zoey <zoey@z0ey.de>
2023-04-14 16:06:37 +02:00
Zoey
ead696b683 Update .github/workflows/imaginary-update.yml
Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Zoey <zoey@z0ey.de>
2023-04-14 15:55:32 +02:00
Zoey
f122ee5a07 Update .github/workflows/imaginary-update.yml
Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Zoey <zoey@z0ey.de>
2023-04-14 15:55:12 +02:00
Zoey
1818eb10c3 Update .github/workflows/imaginary-update.yml
Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Zoey <zoey@z0ey.de>
2023-04-14 15:54:57 +02:00
Simon L
779ca8e03d Merge pull request #2296 from nextcloud/enh/noid/add-easy-login-docs
add a link to the easy-login docs to the app
2023-04-14 15:49:43 +02:00
Simon L
4e7ab122e9 Merge pull request #2331 from nextcloud/szaimen-patch-1
Borg - revert to default checkpoint-interval
2023-04-14 15:49:36 +02:00
Simon L
1c5d9f0eb7 add a tag to the chart-yaml
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-14 15:47:32 +02:00
Simon L
9ba70425f4 re-add charts_dir
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-14 15:46:43 +02:00
Simon L
7acdb2dc92 add a warning as well for FTS
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-14 15:34:01 +02:00
Simon L
157588d95f add a link to the easy-login docs to the app
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-14 15:15:09 +02:00
Simon L
cab39e59be Merge pull request #2334 from nextcloud/enh/noid/disable-fts-on-nc26
disabling FTS on NC26 as the migration to ES8 is still pending
2023-04-14 15:14:01 +02:00
Simon L
ac005eb5c9 Merge pull request #2338 from nextcloud/aio-helm-update
Helm Chart updates
2023-04-14 15:00:35 +02:00
Simon L
4df6d2c971 Borg - revert to default checkpoint-interval
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-14 14:59:02 +02:00
Simon L
b75e10e5f3 Merge pull request #2328 from nextcloud/talk
talk use official coturn image
2023-04-14 14:58:25 +02:00
szaimen
033f0166f4 Helm Chart updates
Signed-off-by: GitHub <noreply@github.com>
2023-04-14 12:57:58 +00:00
Simon L
e7e29a2731 Merge pull request #2327 from ItsQuadrus/patch-1
Missing brace in readme.md
2023-04-14 14:57:35 +02:00
Simon L
916a25a62e Merge pull request #2307 from nextcloud/enh/noid/add-curl-timeout
add timeout for curl
2023-04-14 14:57:18 +02:00
Simon L
5a8989bb9f Merge pull request #2302 from nextcloud/apache-healthcheck
apache healthcheck, check localhost apacheport with every apache port
2023-04-14 14:56:40 +02:00
Simon L
714815e9f0 Merge pull request #2301 from nextcloud/talk-healthcheck
Talk use netcat to check stun/turn port using domain
2023-04-14 14:55:44 +02:00
Simon L
3a9d5d52d5 Merge pull request #2289 from nextcloud/enh/noid/add-nodejs
add nodejs in order to make recognize easier to install on arm64
2023-04-14 14:53:56 +02:00
Simon L
854b4115e8 Merge pull request #2316 from nextcloud/dependabot/docker/Containers/clamav/clamav/clamav-1.0.1-2
Bump clamav/clamav from 1.0.1-1 to 1.0.1-2 in /Containers/clamav
2023-04-14 14:49:39 +02:00
Simon L
23f2e96c71 Merge pull request #2299 from nextcloud/dependabot/docker/Containers/apache/httpd-2.4.57-alpine3.17
Bump httpd from 2.4.56-alpine3.17 to 2.4.57-alpine3.17 in /Containers/apache
2023-04-14 14:49:14 +02:00
Simon L
07adf95c35 Merge pull request #2282 from nextcloud/dependabot/docker/Containers/mastercontainer/docker-23.0.3-cli
Bump docker from 23.0.2-cli to 23.0.3-cli in /Containers/mastercontainer
2023-04-14 14:47:44 +02:00
Simon L
9848ceec38 Merge pull request #2271 from nextcloud/aio-dependency-update
Dependency updates
2023-04-14 14:47:14 +02:00
Simon L
cbfc5d4d15 Merge pull request #2250 from nextcloud/aio-yaml-update
Yaml updates
2023-04-14 14:38:37 +02:00
Simon L
28b9755a50 disabling FTS on NC26 as the migration to ES8 is still pending
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-14 13:41:02 +02:00
Zoey
34a5e6badf fix typo, use always latest build of version
Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Zoey <zoey@z0ey.de>
2023-04-14 11:45:06 +02:00
Zoey
401150d427 add workflow
Signed-off-by: Zoey <zoey@z0ey.de>
2023-04-13 21:51:51 +02:00
Zoey
2d1ddccb28 talk use official coturn image
needs testing

Signed-off-by: Zoey <zoey@z0ey.de>
2023-04-13 21:36:11 +02:00
ItsQuadrus
06733e8009 Missing brace
Signed-off-by: ItsQuadrus <quadrus.yt@gmail.com>
2023-04-13 20:44:59 +02:00
szaimen
0b2c7f09b6 Yaml updates
Signed-off-by: GitHub <noreply@github.com>
2023-04-13 12:02:39 +00:00
szaimen
73e734b011 dependency updates
Signed-off-by: GitHub <noreply@github.com>
2023-04-13 12:02:28 +00:00
Simon L
e1890c8f3b add ref docs on cloudflare tunnel and dns-challenge
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-13 13:29:53 +02:00
Zoey
904d23147c add suggestion
Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Zoey <zoey@z0ey.de>
2023-04-11 10:54:02 +02:00
Zoey
46ec1ea7f5 always check port 443
Signed-off-by: Zoey <zoey@z0ey.de>
2023-04-10 17:50:58 +02:00
Zoey
8cabad38a6 use commit sha and port 9000
Signed-off-by: Zoey <zoey@z0ey.de>
2023-04-10 17:20:04 +02:00
dependabot[bot]
1fa1c90e22 Bump clamav/clamav from 1.0.1-1 to 1.0.1-2 in /Containers/clamav
Bumps clamav/clamav from 1.0.1-1 to 1.0.1-2.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-10 12:59:47 +00:00
Simon L
1ce496a323 add timeout for curl
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-09 01:03:06 +02:00
Zoey
d93c01f368 apache healthcheck, check localhost apacheport with every apache port
Signed-off-by: Zoey <zoey@z0ey.de>
2023-04-08 13:28:19 +02:00
Zoey
ee5d9493de Talk use netcat to check stun/turn port using domain
Signed-off-by: Zoey <zoey@z0ey.de>
2023-04-08 13:25:40 +02:00
Simon L
c5a1a00e38 update wording for cleaning up things properlyd
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-07 17:00:52 +02:00
dependabot[bot]
99f29aaaed Bump httpd in /Containers/apache
Bumps httpd from 2.4.56-alpine3.17 to 2.4.57-alpine3.17.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-07 12:59:09 +00:00
Simon L
0435609521 add nodejs in order to make recognize easier to install on arm64
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-06 15:49:25 +02:00
Zoey
6fe6d7e0b4 migrate imaginary container to alpine
I think this is much better, then the old workflow (https://github.com/nextcloud-releases/all-in-one/blob/main/.github/workflows/imaginary.yml)

Signed-off-by: Zoey <zoey@z0ey.de>
2023-04-06 15:05:59 +02:00
dependabot[bot]
d3b099e8e3 Bump docker from 23.0.2-cli to 23.0.3-cli in /Containers/mastercontainer
Bumps docker from 23.0.2-cli to 23.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>
2023-04-05 15:25:20 +00:00
Simon L
3cebbb6487 Merge pull request #2284 from nextcloud/dependabot/github_actions/peter-evans/create-pull-request-5
Bump peter-evans/create-pull-request from 4 to 5
2023-04-05 17:24:47 +02:00
Simon L
c6fc7baf2d Merge pull request #2283 from nextcloud/dependabot/github_actions/peter-evans/create-or-update-comment-3
Bump peter-evans/create-or-update-comment from 2 to 3
2023-04-05 16:47:59 +02:00
dependabot[bot]
0c93ad6def Bump peter-evans/create-pull-request from 4 to 5
Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 4 to 5.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v4...v5)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-05 13:00:25 +00:00
dependabot[bot]
cd2208f295 Bump peter-evans/create-or-update-comment from 2 to 3
Bumps [peter-evans/create-or-update-comment](https://github.com/peter-evans/create-or-update-comment) from 2 to 3.
- [Release notes](https://github.com/peter-evans/create-or-update-comment/releases)
- [Commits](https://github.com/peter-evans/create-or-update-comment/compare/v2...v3)

---
updated-dependencies:
- dependency-name: peter-evans/create-or-update-comment
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-05 13:00:21 +00:00
Simon L
e55500640b Merge pull request #2273 from nextcloud/MariusQuabeck-patch-1
add default path for borg compact
2023-04-05 11:58:44 +02:00
Marius Quabeck
ab8b455b71 add default path for borg compact
all examples up until the compact section work under the assumption that you are using the default backup path "/mnt/backup/borg" so path for compact should be the same

Signed-off-by: Marius Quabeck <marius.quabeck@nextcloud.com>
2023-04-04 18:03:11 +02:00
Simon L
81a8352d64 update dependency-update workflow
ssh ncadmin@192.168.24.128
2023-04-04 14:34:21 +02:00
Simon L
93a0616f7e increase to 4.8.1
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-03 10:30:05 +02:00
Simon L
409dda00bd Merge pull request #2255 from nextcloud/enh/noid/remove-workarounds
remove temporarily added dependencies after avatar problem was fixed
2023-04-03 10:29:01 +02:00
Simon L
517ac319ba Merge pull request #2259 from nextcloud/enh/2258/fix-details
define updaterdirectory and add forgotten exit
2023-04-03 10:27:27 +02:00
Simon L
34d8ae8e5a Merge pull request #2256 from nextcloud/enh/noid/add-sysvsem
add sysvsem
2023-04-03 10:26:49 +02:00
Simon L
ed36ba6c8d define updaterdirectory and add forgotten exit
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-02 11:26:42 +02:00
Simon L
15c90407bc add sysvsem
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-01 21:04:45 +02:00
Simon L
287a5a08cd remove temporarily added dependencies after avatar problem was fixed
after https://github.com/nextcloud/all-in-one/issues/1628 was fixed
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-01 21:01:28 +02:00
Simon L
187bf3f767 only show the note about nc26 when all containers are started
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-01 14:44:39 +02:00
Simon L
7a10602c63 increase width to 500px
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-01 14:37:42 +02:00
Simon L
aba666859b fix and sign in twig template
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-01 14:26:03 +02:00
Simon L
00a7e65a2d Merge pull request #2249 from nextcloud/enh/noid/add-remote-backup-section
add a section to the readme about remote borg backups
2023-04-01 14:21:45 +02:00
Simon L
fb3b040290 add a section to the readme about remote borg backups
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-01 14:20:25 +02:00
Simon L
baf7778ed3 increase to 4.8.0
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-01 14:15:14 +02:00
Simon L
565a84a7bf Merge pull request #2252 from nextcloud/enh/noid/domain-dot
domain must contain at least one dot
2023-04-01 14:14:32 +02:00
Simon L
6b0ce132f9 Merge pull request #2209 from nextcloud/enh/noid/note-about-26
Note on Nextcloud 26
2023-04-01 14:14:18 +02:00
Simon L
cc13161ec6 domain must contain at least one dot
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-01 14:05:40 +02:00
Simon L
7ccc699402 Merge pull request #2251 from nextcloud/enh/noid/fix-login-form
fix the login form
2023-04-01 13:36:18 +02:00
Simon L
9954641e02 fix the login form
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-01 13:33:11 +02:00
Simon L
c1595afe2d Merge pull request #2246 from nextcloud/automated/noid/psalm-baseline-update-1680236481
[Automated] Update psalm-baseline.xml
2023-03-31 12:33:18 +02:00
Simon L
974190fd86 move the options-form-submit to the containers layout
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-31 12:24:03 +02:00
Simon L
1bf1b2b284 options-form-submit is not needed for the login layout
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-31 12:05:41 +02:00
Simon L
291d543f37 Merge pull request #2248 from nextcloud/enh/noid/shm-size-int
shm-size must be an int
2023-03-31 11:45:22 +02:00
Simon L
8b6bb94539 shm-size must be an int
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-31 11:27:11 +02:00
Simon L
1cae0980cd Correct cifs mount example
Signed-off-by: Simon L. <szaimen@e.mail.de>
2023-03-31 09:25:14 +02:00
nextcloud-command
bd4d16ebb0 Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2023-03-31 04:21:20 +00:00
Simon L
ba2b5a4638 Merge pull request #2243 from nextcloud/enh/noid/docker-dind
change docker:dind to docker:cli
2023-03-30 20:16:45 +02:00
Simon L
98eb90360b add a bit more logic
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-30 18:12:57 +02:00
Simon L
2a9c4e3198 wip on note about Nextcloud 26
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-30 18:11:59 +02:00
Simon L
94f7ca00b5 change docker:dind to docker:cli
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-30 18:05:02 +02:00
Simon L
b4a8d7d649 Merge pull request #2241 from nextcloud/dependabot/docker/Containers/borgbackup/alpine-3.17.3
Bump alpine from 3.17.2 to 3.17.3 in /Containers/borgbackup
2023-03-30 17:55:10 +02:00
dependabot[bot]
63e7be45fe Bump alpine from 3.17.2 to 3.17.3 in /Containers/borgbackup
Bumps alpine from 3.17.2 to 3.17.3.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-30 15:54:46 +00:00
Simon L
f6f5598e97 Merge pull request #2240 from nextcloud/dependabot/docker/Containers/watchtower/alpine-3.17.3
Bump alpine from 3.17.2 to 3.17.3 in /Containers/watchtower
2023-03-30 17:54:45 +02:00
dependabot[bot]
736e93b5eb Bump alpine from 3.17.2 to 3.17.3 in /Containers/watchtower
Bumps alpine from 3.17.2 to 3.17.3.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-30 15:54:26 +00:00
Simon L
db9657f125 Merge pull request #2239 from nextcloud/dependabot/docker/Containers/domaincheck/alpine-3.17.3
Bump alpine from 3.17.2 to 3.17.3 in /Containers/domaincheck
2023-03-30 17:54:09 +02:00
Simon L
2b1ae17e88 Merge pull request #2207 from nextcloud/enh/2203/add-dot
add dot to allowed characters in additional backup volumes
2023-03-30 17:53:48 +02:00
Simon L
e6510c21cf Merge pull request #2237 from nextcloud/dependabot/docker/Containers/talk/alpine-3.17.3
Bump alpine from 3.17.2 to 3.17.3 in /Containers/talk
2023-03-30 17:53:32 +02:00
Simon L
92dd734993 Merge pull request #2232 from nextcloud/enh/noid/fix-datdir-permissions
fix the datadir permission problems during install
2023-03-30 15:42:10 +02:00
Simon L
556afe5f51 Merge pull request #2230 from nextcloud/enh/noid/internal-ip-wording
improve wording of internal ip in case of reverse proxy situation
2023-03-30 15:39:05 +02:00
Simon L
23e495fc45 Merge pull request #2226 from nextcloud/enh/noid/increase-shm-size
increase shm_size for postgresql
2023-03-30 15:36:54 +02:00
Simon L
5002de61a2 Merge pull request #2224 from nextcloud/dependabot/docker/Containers/collabora/collabora/code-22.05.12.4.1
Bump collabora/code from 22.05.12.2.1 to 22.05.12.4.1 in /Containers/collabora
2023-03-30 15:35:33 +02:00
Simon L
c56959b9d0 Merge pull request #2210 from nextcloud/enh/2195/allow-digits-in-startup-apps
allow digits in NEXTCLOUD_STARTUP_APPS
2023-03-30 15:35:03 +02:00
Simon L
5d9573602b also update the ui
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-30 15:32:25 +02:00
Simon L
aba40c4633 Merge pull request #2206 from nextcloud/enh/2195/adjust-datadir-wording
adjust wording of regex for NEXTCLOUD_DATADIR
2023-03-30 15:30:45 +02:00
dependabot[bot]
ec6b37178b Bump alpine from 3.17.2 to 3.17.3 in /Containers/domaincheck
Bumps alpine from 3.17.2 to 3.17.3.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-30 12:59:29 +00:00
dependabot[bot]
a0267c6efa Bump alpine from 3.17.2 to 3.17.3 in /Containers/talk
Bumps alpine from 3.17.2 to 3.17.3.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-30 12:59:17 +00:00
Simon L
f0222394a1 Merge pull request #2185 from nextcloud/enh/noid/enable-jit
enable JIT
2023-03-30 12:23:56 +02:00
Simon L
ba88aa1d35 Merge pull request #2234 from nextcloud/enh/noid/add-helm-docs
add some docs on how to use helm-chart
2023-03-30 12:17:46 +02:00
Simon L
f726e4a8c6 add steps how to adjust values
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-30 12:16:49 +02:00
Simon L
7da2c627c6 Merge pull request #2235 from nextcloud/enh/noid/update-helm-another-time
fix helm-chart update
2023-03-30 12:10:46 +02:00
Simon L
e75a426749 try to update helm-chart again
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-30 12:09:17 +02:00
Simon L
5058270c99 add some docs on how to use helm-chart
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-30 11:37:09 +02:00
Simon L
e0f4024ead update links of helm-chart
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-30 11:32:12 +02:00
Simon L
c63d44c1cf improve helm-releaser
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-30 11:30:33 +02:00
Simon L
cb3d8d6b30 Merge pull request #2229 from nextcloud/enh/nod/update-helm-chart-updates
update helm-chart updates
2023-03-30 11:27:47 +02:00
Simon L
fe336cf6d8 update helm-chart updates
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-30 11:24:16 +02:00
Simon L
386533b02f fix the datadir permission problems during install
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-30 10:54:56 +02:00
Simon L
cd6f5ccebd improve wording of internal ip in case of reverse proxy situation
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-30 10:23:05 +02:00
Simon L
9c0ea8a23c Merge pull request #2228 from nextcloud/aio-helm-update
Helm Chart updates
2023-03-30 09:57:44 +02:00
szaimen
d5c857325b Helm Chart updates
Signed-off-by: GitHub <noreply@github.com>
2023-03-30 07:56:26 +00:00
Simon L
ef42467cc2 add a link to traefik config
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-29 18:46:14 +02:00
Simon L
d0f11028d3 increase shm_size for postgresql
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-29 10:57:44 +02:00
dependabot[bot]
0e7e1eaf3d Bump collabora/code in /Containers/collabora
Bumps collabora/code from 22.05.12.2.1 to 22.05.12.4.1.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-27 13:51:30 +00:00
Simon L
20062b6095 allow digits in NEXTCLOUD_STARTUP_APPS
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-26 14:50:09 +02:00
Simon L
bf9482e560 Make sure that NEXTCLOUD_DATADIR is not misleading
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-26 14:46:22 +02:00
Simon L
b7e012f886 add dot to allowed characters in additional backup volumes
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-25 10:12:38 +01:00
Simon L
b4bd4d115d Add additional check to properly resetting things
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-25 10:09:57 +01:00
Simon L
961f894372 adjust wording of regex for NEXTCLOUD_DATADIR
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-25 09:56:34 +01:00
Simon L
a68b00b126 adjust labels
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-24 12:14:02 +01:00
Simon L
1c2b4f042d try to fix the helm-releaser
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-24 12:13:26 +01:00
Simon L
c9acb396ad add labels to chart.yaml
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-24 12:10:03 +01:00
Simon L
af974046f5 Merge pull request #2034 from nextcloud/enh/1582/add-helm-chart-release
Add Helm Chart Releaser workflow
2023-03-24 12:04:41 +01:00
Simon L
62afa918f0 switch chart-release-action to main
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-24 12:01:35 +01:00
Simon L
69cb6bee4d enable JIT
based on https://github.com/nextcloud/documentation/pull/9230
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-23 15:22:24 +01:00
Simon L
fc56c262c1 increase to 4.7.0
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-23 14:32:06 +01:00
Simon L
ed1e6191b8 Merge pull request #2156 from nextcloud/aio-helm-update
Helm Chart updates
2023-03-23 14:31:16 +01:00
Simon L
4ffc3fc866 Merge pull request #2183 from nextcloud/enh/noid/permission-check
Add even more hints to datadir permission check
2023-03-23 14:30:29 +01:00
Simon L
cf8cfc5dff Merge pull request #2184 from nextcloud/nextcloud-container-update
Nextcloud update
2023-03-23 13:53:38 +01:00
szaimen
f1edbd71c5 nextcloud-update automated change
Signed-off-by: GitHub <noreply@github.com>
2023-03-23 12:52:17 +00:00
Simon L
de64fceab9 Add even more hints to datadir permission check
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-23 13:51:46 +01:00
Simon L
d20489de7c Merge pull request #2177 from nextcloud/enh/noid/talk-stun
talk - stun servers may be empty
2023-03-23 13:41:39 +01:00
szaimen
83fb39dabf Helm Chart updates
Signed-off-by: GitHub <noreply@github.com>
2023-03-22 12:37:19 +00:00
Simon L
4256dc8021 talk - stun servers may be empty
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-21 19:17:41 +01:00
Zoey
af78a8ff4c Migrate talk container to alpine (#1583)
Signed-off-by: Zoey <zoey@z0ey.de>
2023-03-21 18:39:18 +01:00
Simon L
48f93991bb Merge pull request #2171 from nextcloud/dependabot/docker/Containers/collabora/collabora/code-22.05.12.2.1
Bump collabora/code from 22.05.12.1.1 to 22.05.12.2.1 in /Containers/collabora
2023-03-21 18:09:41 +01:00
Simon L
a86555da16 Merge pull request #2174 from nextcloud/dependabot/docker/Containers/redis/redis-7.0.10-alpine
Bump redis from 7.0.9-alpine to 7.0.10-alpine in /Containers/redis
2023-03-21 18:09:20 +01:00
dependabot[bot]
e16340ffcb Bump redis from 7.0.9-alpine to 7.0.10-alpine in /Containers/redis
Bumps redis from 7.0.9-alpine to 7.0.10-alpine.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-21 12:59:46 +00:00
Simon L
28ec69e505 re-order cloudflare notes and add another one
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-21 13:56:38 +01:00
Simon L
9a1371a96b still log to cli output
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-20 16:10:38 +01:00
Simon L
71f143b4aa fix phpdd
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-20 16:04:28 +01:00
dependabot[bot]
a9a3f74d45 Bump collabora/code in /Containers/collabora
Bumps collabora/code from 22.05.12.1.1 to 22.05.12.2.1.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-20 13:02:09 +00:00
Simon L
43b15ae7e7 Merge pull request #2166 from nextcloud/dependabot/docker/Containers/mastercontainer/php-8.1.17-fpm-alpine3.17
Bump php from 8.1.16-fpm-alpine3.17 to 8.1.17-fpm-alpine3.17 in /Containers/mastercontainer
2023-03-17 16:52:57 +01:00
Simon L
3d8fa710c1 Merge pull request #2165 from nextcloud/dependabot/docker/Containers/collabora/collabora/code-22.05.12.1.1
Bump collabora/code from 22.05.10.8.1 to 22.05.12.1.1 in /Containers/collabora
2023-03-17 16:52:27 +01:00
dependabot[bot]
dbe30bba2c Bump php in /Containers/mastercontainer
Bumps php from 8.1.16-fpm-alpine3.17 to 8.1.17-fpm-alpine3.17.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-17 13:00:30 +00:00
dependabot[bot]
d41d0c7f94 Bump collabora/code in /Containers/collabora
Bumps collabora/code from 22.05.10.8.1 to 22.05.12.1.1.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-17 12:59:53 +00:00
Simon L
4b30bcd92e Merge pull request #2134 from nextcloud/enh/noid/add-docker-swarm-note
add link about docker swarm directly to startup script
2023-03-15 14:27:31 +01:00
Simon L
01a670e503 Merge pull request #2135 from nextcloud/enh/noid/improve-dns-hint
improve hint about dns resolving
2023-03-15 14:26:46 +01:00
Simon L
9876491446 Merge pull request #2141 from nextcloud/dependabot/composer/php/guzzlehttp/psr7-2.4.4
Bump guzzlehttp/psr7 from 2.4.3 to 2.4.4 in /php
2023-03-15 14:25:56 +01:00
Simon L
cc3b94a4c1 Merge pull request #2152 from nextcloud/enh/noid/fix-app-update
try to update all apps a second time and try to prevent breakage
2023-03-15 14:25:21 +01:00
Simon L
3c1dcb374f update OO
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-15 14:18:30 +01:00
Simon L
1322eea980 Merge pull request #2095 from nextcloud/aio-yaml-update
Yaml updates
2023-03-15 12:28:11 +01:00
Simon L
c22a94ccc3 try to update all apps a second time and try to prevent breakage
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-13 22:14:40 +01:00
szaimen
51f3964c27 Yaml updates
Signed-off-by: GitHub <noreply@github.com>
2023-03-13 12:17:42 +00:00
Simon L
e50ad0b850 Merge pull request #2150 from nextcloud/nickvergessen-patch-1
fix(docs): Enforce HTTPS usage
2023-03-13 11:53:19 +01:00
Joas Schilling
569975297a fix(docs): Enforce HTTPS usage
Signed-off-by: Joas Schilling <213943+nickvergessen@users.noreply.github.com>
2023-03-13 11:22:38 +01:00
Simon L
e6b63cf9ef Merge pull request #2149 from goldstar611/patch-1
Fix typo
2023-03-13 10:00:08 +01:00
Tony F
1546db7f9f Fix typo
Signed-off-by: Tony F <goldstar611@hotmail.com>
2023-03-12 20:51:00 -05:00
Simon L
2666313d63 Merge pull request #2144 from nextcloud/nginx-0rtt-off
nginx reverse proxy docs: disable 0-rtt
2023-03-11 16:56:33 +01:00
Zoey
cfbb6752ee nginx reverse proxy docs: disable 0-rtt
0-rtt is not recommended by internet.nl

Signed-off-by: Zoey <zoey@z0ey.de>
2023-03-11 14:32:25 +01:00
dependabot[bot]
cd34d8d6f5 Bump guzzlehttp/psr7 from 2.4.3 to 2.4.4 in /php
Bumps [guzzlehttp/psr7](https://github.com/guzzle/psr7) from 2.4.3 to 2.4.4.
- [Release notes](https://github.com/guzzle/psr7/releases)
- [Changelog](https://github.com/guzzle/psr7/blob/master/CHANGELOG.md)
- [Commits](https://github.com/guzzle/psr7/compare/2.4.3...2.4.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-10 13:00:15 +00:00
Simon L
0b15352132 Merge pull request #2136 from nextcloud/automated/noid/psalm-baseline-update-1678425123
[Automated] Update psalm-baseline.xml
2023-03-10 11:27:53 +01:00
Simon L
c5bfdbb653 fix psalm
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-10 11:26:04 +01:00
nextcloud-command
cbc19c17ca Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2023-03-10 05:12:02 +00:00
Simon L
067604ceac improve hint about dns resolving
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-09 20:22:50 +01:00
Simon L
e6ecf52df9 add link about docker swarm directly to startup script
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-09 20:17:51 +01:00
Simon L
5e6e433cd2 Merge pull request #2131 from nextcloud/enh/noid/revert-talk-apache
revert "Talk - Apache seemingly needs to be whitelisted as well"
2023-03-09 18:57:31 +01:00
Simon L
86b6d92761 revert "Talk - Apache seemingly needs to be whitelisted as well"
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-09 18:55:53 +01:00
Simon L
a97af08bb8 talk - wait for nextcloud-aio-apache to be started
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-09 18:25:05 +01:00
Simon L
264980df57 increase to 4.6.2
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-09 18:05:54 +01:00
Simon L
e94f63bd26 Merge pull request #2127 from nextcloud/enh/noid/add-reasons
add reasons why changing volume and container name is not supported
2023-03-09 18:04:14 +01:00
Simon L
4689e402f8 Merge pull request #2128 from nextcloud/enh/noid/talk-whitelist-apache
Talk - Apache seemingly needs to be whitelisted as well
2023-03-09 18:03:15 +01:00
Simon L
ba760b060e Merge pull request #2129 from nextcloud/enh/noid/collabora-mount_jail_tree
collabora - add mount_jail_tree=false
2023-03-09 18:02:17 +01:00
Simon L
4800888da6 collabora - add mount_jail_tree=false
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-09 17:55:48 +01:00
Simon L
8539b25278 Talk - Apache seemingly needs to be whitelisted as well
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-09 17:08:21 +01:00
Simon L
5ddf989703 add reasons why changing volume and container name is not supported
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-09 16:23:31 +01:00
Simon L
90c2328400 increase to 4.6.1
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-08 14:54:23 +01:00
Simon L
f5ee38247c Merge pull request #2122 from nextcloud/enh/noid/fix-borg-globbing
borg script - disable globbing
2023-03-08 14:53:33 +01:00
Simon L
f51029270b Merge pull request #2123 from nextcloud/enh/noid/imaginary-prevent-memory-issues
imaginary - try to prevent possible memory issues
2023-03-08 14:52:59 +01:00
Simon L
d27aa357db Merge pull request #2125 from nextcloud/dependabot/docker/Containers/apache/httpd-2.4.56-alpine3.17
Bump httpd from 2.4.55-alpine3.17 to 2.4.56-alpine3.17 in /Containers/apache
2023-03-08 14:09:07 +01:00
dependabot[bot]
4b3e192ee6 Bump httpd in /Containers/apache
Bumps httpd from 2.4.55-alpine3.17 to 2.4.56-alpine3.17.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-08 13:00:51 +00:00
Simon L
d974023c8d imaginary - try to prevent possible memory issues
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-08 11:08:03 +01:00
Simon L
204aa5649c fix typo
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-08 00:12:54 +01:00
Simon L
8cd5f604c4 Nextcloud_mount is actually supported on windows now
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-07 23:26:42 +01:00
Simon L
fdb0330959 add an example for NEXTCLOUD_MOUNT on macOS
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-07 23:16:17 +01:00
Simon L
4f5062080b borg script - disable globbing
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-07 23:15:15 +01:00
Simon L
39b669ae83 fix typo
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-07 11:27:07 +01:00
Simon L
671a73a6c4 fix typo
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-07 10:57:51 +01:00
Simon L
a4f0852bdf increase to 4.6.0
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-07 10:43:04 +01:00
Simon L
46ae99e36b Merge pull request #2109 from nextcloud/enh/noid/change-permission-check
change how permission check setting works
2023-03-07 10:41:22 +01:00
Simon L
07054d869b Merge pull request #2114 from nextcloud/enh/noid/update-imaginary-dependencies
update some imaginary dependencies to improve performance
2023-03-07 10:23:23 +01:00
Simon L
ebbcb998ce address review
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-07 10:04:11 +01:00
Simon L
9f8d17d888 Merge pull request #2113 from nextcloud/enh/noid/cap_add
fix set_memory for imaginary and move cap_add to containers.json
2023-03-07 09:59:45 +01:00
Simon L
56a95182c7 change to bookworm
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-07 09:56:03 +01:00
Simon L
e218c1d041 Merge pull request #2107 from nextcloud/enh/noid/add-another-volume-check
add a check if the mastercontainer volume is really connected to the mastercontainer
2023-03-07 09:53:20 +01:00
Simon L
356792ec68 Merge pull request #2106 from nextcloud/enh/noid/rm-tzdata-master
remove tzdata from mastercontainer
2023-03-07 09:46:55 +01:00
Simon L
30ae4eeecd Merge pull request #2098 from nextcloud/enh/noid/exclude-some-logs
exclude nextcloud and audit log in backup due to GPDR reasons
2023-03-07 09:46:38 +01:00
Simon L
8685107e2e Merge pull request #2118 from nextcloud/enh/noid/send-update-notification-on-saturdays
only send update notifications on saturdays
2023-03-07 09:44:43 +01:00
Simon L
f01a5841b9 only send update notifications on saturdays
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-07 09:29:04 +01:00
Simon L
2a01e9683b exclude nextcloud and audit log in backup due to GPDR reasons
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-07 09:22:02 +01:00
Simon L
0873e526b4 Merge pull request #2115 from spatterIight/patch-1
Update migration.md
2023-03-07 08:57:46 +01:00
spatterlight
2306587a7d Update migration.md
Fixed typo

Signed-off-by: spatterlight <81454789+spatterIight@users.noreply.github.com>
2023-03-06 21:14:45 +00:00
Simon L
69b0911db1 add two options to cifs mount
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-06 15:14:04 +01:00
Simon L
6587530242 fix set_memory for imaginary and move cap_add to containers.json
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-06 11:45:07 +01:00
Simon L
cf3f1f04cd update some imaginary dependencies to improve performance
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-06 11:42:00 +01:00
Simon L
ba6efd2a9c change how permission check setting works
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-05 14:36:21 +01:00
Simon L
1e96eed341 add a check if the mastercontainer volume is really connected to the mastercontainer
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-04 20:17:19 +01:00
Simon L
c54395aa4c update snap migration advice
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-04 18:02:05 +01:00
Simon L
4590b28b50 remove tzdata from mastercontainer
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-04 17:26:57 +01:00
Simon L
a77ae20e5d Merge pull request #2102 from shaan7/patch-1
Fix directory path example
2023-03-03 23:23:14 +01:00
Shantanu Tushar
c5e481b767 Fix directory path example
`/run/desktop/mnt/host/c/ncdata` does not really contain the word `backup`, so I'm guessing `C:\backup` is a typo.

Signed-off-by: Shantanu Tushar <shaan7in@gmail.com>
2023-03-04 03:17:33 +05:30
Simon L
c23b7aa396 increase to 4.5.1
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-02 15:48:51 +01:00
Simon L
a12022f290 Merge pull request #2096 from nextcloud/dependabot/docker/Containers/collabora/collabora/code-22.05.10.8.1
Bump collabora/code from 22.05.10.7.1 to 22.05.10.8.1 in /Containers/collabora
2023-03-02 15:44:22 +01:00
Simon L
01291bbcce Merge pull request #2097 from nextcloud/dependabot/docker/Containers/talk/ubuntu-focal-20230301
Bump ubuntu from focal-20230126 to focal-20230301 in /Containers/talk
2023-03-02 15:43:56 +01:00
Simon L
97b0622cc3 fix typo
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-02 14:50:50 +01:00
dependabot[bot]
f67cae35fa Bump ubuntu from focal-20230126 to focal-20230301 in /Containers/talk
Bumps ubuntu from focal-20230126 to focal-20230301.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-02 13:00:49 +00:00
dependabot[bot]
50aa368169 Bump collabora/code in /Containers/collabora
Bumps collabora/code from 22.05.10.7.1 to 22.05.10.8.1.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-02 13:00:44 +00:00
Simon L
5748f111d3 Merge pull request #2094 from nextcloud/aio-helm-update
Helm Chart updates
2023-03-02 12:22:11 +01:00
szaimen
aec815119e Helm Chart updates
Signed-off-by: GitHub <noreply@github.com>
2023-03-02 11:20:49 +00:00
Simon L
6463ea368a Merge pull request #2080 from nextcloud/fix/2077/fix-datadir-permission-check
fix datadir permission check
2023-03-02 11:49:42 +01:00
Simon L
2aef10ce47 Merge pull request #2092 from nextcloud/enh/2089/clamav-timeout
don't wait for clamav until forever
2023-03-02 11:46:30 +01:00
Simon L
81dff779b6 Merge pull request #2091 from nextcloud/enh/noid/improve-volume-check
improve the volume and container name check
2023-03-02 11:43:16 +01:00
Simon L
a34d6c1726 Merge pull request #2087 from nextcloud/dependabot/docker/Containers/imaginary/nextcloud/imaginary-20230301
Bump nextcloud/imaginary from 20230201 to 20230301 in /Containers/imaginary
2023-03-02 10:35:42 +01:00
Simon L
9bddac5937 Merge pull request #2086 from nextcloud/dependabot/docker/Containers/redis/redis-7.0.9-alpine
Bump redis from 7.0.8-alpine to 7.0.9-alpine in /Containers/redis
2023-03-02 10:35:12 +01:00
Simon L
fba13e8824 Merge pull request #2085 from nextcloud/aio-dependency-update
Dependency updates
2023-03-02 10:34:53 +01:00
Simon L
bc3e13bf69 Merge pull request #2084 from nextcloud/dependabot/docker/Containers/collabora/collabora/code-22.05.10.7.1
Bump collabora/code from 22.05.10.2.1 to 22.05.10.7.1 in /Containers/collabora
2023-03-02 10:34:31 +01:00
Simon L
ee06a04f51 fix datadir permission check
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-02 10:33:51 +01:00
Simon L
1f66f4c9ca Merge pull request #2067 from nextcloud/aio-yaml-update
Yaml updates
2023-03-02 09:58:57 +01:00
Simon L
6a22d5443b don't wait for clamav until forever
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-02 09:46:21 +01:00
Simon L
98078cbe0a improve the volume and container name check
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-03-02 09:25:14 +01:00
dependabot[bot]
de9b2bba0e Bump nextcloud/imaginary in /Containers/imaginary
Bumps nextcloud/imaginary from 20230201 to 20230301.

---
updated-dependencies:
- dependency-name: nextcloud/imaginary
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-01 13:06:33 +00:00
dependabot[bot]
5fbe902145 Bump redis from 7.0.8-alpine to 7.0.9-alpine in /Containers/redis
Bumps redis from 7.0.8-alpine to 7.0.9-alpine.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-01 13:03:34 +00:00
szaimen
0dcdbf8be2 dependency updates
Signed-off-by: GitHub <noreply@github.com>
2023-03-01 12:17:25 +00:00
dependabot[bot]
9758c12491 Bump collabora/code in /Containers/collabora
Bumps collabora/code from 22.05.10.2.1 to 22.05.10.7.1.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-28 13:00:41 +00:00
szaimen
d9ec23e0f8 Yaml updates
Signed-off-by: GitHub <noreply@github.com>
2023-02-28 12:17:26 +00:00
Simon L
a06add045c Merge pull request #2079 from nextcloud/automated/noid/psalm-baseline-update-1677471769
[Automated] Update psalm-baseline.xml
2023-02-28 09:14:57 +01:00
nextcloud-command
5fd0b3294e Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2023-02-27 04:22:49 +00:00
Simon L
bcdb692dd1 Merge pull request #2062 from nextcloud/note-architectures
add a note on supported architectures
2023-02-23 18:32:26 +01:00
Zoey
ac7c7b19d8 add note on uname -m
Signed-off-by: Zoey <zoey@z0ey.de>
2023-02-23 18:31:09 +01:00
Simon L
d8de7e0765 Merge pull request #2051 from nextcloud/improve-docker-cleanup
Cron: remove nextcloud-aio-domaincheck if stopped
2023-02-23 18:27:40 +01:00
Zoey
cf8d3dd437 add a note on supported architectures
Signed-off-by: Zoey <zoey@z0ey.de>
2023-02-23 18:26:25 +01:00
Zoey
3eb3a9ff9f remove -w from grep
Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Zoey <zoey@z0ey.de>
2023-02-23 18:19:51 +01:00
Zoey
73b4c2d3ea add missing sudo
Signed-off-by: Zoey <zoey@z0ey.de>
2023-02-23 18:13:22 +01:00
Zoey
d7a174615c only remove domaincheck container if it is stopped
Signed-off-by: Zoey <zoey@z0ey.de>
2023-02-23 18:05:34 +01:00
Zoey
e2f92a30c6 remove removing tmp volumes
Signed-off-by: Zoey <zoey@z0ey.de>
2023-02-23 18:05:08 +01:00
Simon L
e28aef0c6a increase to 4.5.0
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-23 17:55:36 +01:00
Simon L
8a0c495d4d Merge pull request #2029 from nextcloud/enh/noid/improve-backup-starting-container-conflict
add a more generous solution to starting containers while backup stil…
2023-02-23 17:52:23 +01:00
Simon L
70eefd1f0d Merge pull request #2061 from nextcloud/fix/2057/install-check
fix install check for primary object storage
2023-02-23 17:48:30 +01:00
Simon L
457644dc52 Merge pull request #2059 from nextcloud/nextcloud-container-update
Nextcloud update
2023-02-23 17:48:04 +01:00
Simon L
3f22ec8b4d Merge pull request #2042 from nextcloud/enh/noid/add-network-option
add additional network option
2023-02-23 17:44:23 +01:00
Simon L
85e3172d7f Merge pull request #2040 from nextcloud/enh/noid/connect-via-localhost
talk - improve a few things
2023-02-23 17:43:10 +01:00
Simon L
c9f2d260f1 Merge pull request #2033 from nextcloud/dependabot/docker/Containers/collabora/collabora/code-22.05.10.2.1
Bump collabora/code from 22.05.10.1.1 to 22.05.10.2.1 in /Containers/collabora
2023-02-23 17:42:25 +01:00
Simon L
6506594155 Merge pull request #2032 from nextcloud/enh/2030/add-util-linux-misc
add util-linux-misc which might be required on alpine linux
2023-02-23 17:41:46 +01:00
Simon L
491693f402 add a more generous solution to starting containers while backup still running
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-23 17:41:10 +01:00
Simon L
2c546fd5be Merge pull request #2020 from nextcloud/enh/2019/fix-db-migration
also overwrite db_name to fix db migration
2023-02-23 17:35:25 +01:00
Simon L
9e8cab8eec Merge pull request #2015 from nextcloud/fix-collabora-ipv6
fix collabora ipv6-check
2023-02-23 17:34:43 +01:00
Simon L
d686d3eae0 Merge pull request #2011 from nextcloud/enh/noid/fix-wrong-mountpoint
docker-aio-config should not be a volume by default
2023-02-23 17:34:03 +01:00
Simon L
7c9cbdc121 Merge pull request #1254 from nextcloud/enh/591/turnserver
Improve turn server
2023-02-23 17:31:45 +01:00
Simon L
f8457a2830 fix install check for primary object storage
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-23 17:09:10 +01:00
Simon L
6a86209451 Merge pull request #2058 from nextcloud/aio-helm-update
Helm Chart updates
2023-02-23 15:39:17 +01:00
szaimen
ea5219f40d Helm Chart updates
Signed-off-by: GitHub <noreply@github.com>
2023-02-23 14:36:40 +00:00
Simon L
f2154bf2b7 try to fix volume order
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-23 15:36:05 +01:00
szaimen
fc1d8e0b32 nextcloud-update automated change
Signed-off-by: GitHub <noreply@github.com>
2023-02-23 12:43:24 +00:00
Zoey
9e9e991cb6 add sudo
Signed-off-by: Zoey <zoey@z0ey.de>
2023-02-23 07:00:05 +01:00
Zoey
c2444912b8 the image is a volume...
Signed-off-by: Zoey <zoey@z0ey.de>
2023-02-22 18:10:51 +01:00
Zoey
e85c43d075 Cron: clean nextcloud-aio-domaincheck/tmp volumes
Signed-off-by: Zoey <zoey@z0ey.de>
2023-02-22 18:03:48 +01:00
szaimen
66851eda8f improve turn server
Signed-off-by: szaimen <szaimen@e.mail.de>
2023-02-22 13:25:41 +01:00
Simon L
93bd1ce2ee talk - improve a few things
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-22 12:35:33 +01:00
Simon L
c3d3a29c6b Merge pull request #2048 from nextcloud/automated/noid/psalm-baseline-update-1677040067
[Automated] Update psalm-baseline.xml
2023-02-22 10:13:47 +01:00
nextcloud-command
cad3b0968a Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2023-02-22 04:27:47 +00:00
Simon L
a2585fffe4 Revert "only check for internal ip-address"
This reverts commit b8930bc577.
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-21 17:31:26 +01:00
Simon L
b8930bc577 only check for internal ip-address
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-21 16:07:26 +01:00
Simon L
e0a7ca3656 add additional network option
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-21 15:36:03 +01:00
Simon L
dfc2d9798e Merge pull request #2039 from nextcloud/automated/noid/psalm-baseline-update-1676954190
[Automated] Update psalm-baseline.xml
2023-02-21 09:12:31 +01:00
nextcloud-command
403cc5cae7 Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2023-02-21 04:36:29 +00:00
Simon L
1a329d83aa Add Helm Chart Releaser workflow
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-20 18:11:56 +01:00
dependabot[bot]
f4e471e002 Bump collabora/code in /Containers/collabora
Bumps collabora/code from 22.05.10.1.1 to 22.05.10.2.1.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-20 12:20:53 +00:00
Simon L
a8ac8a8c00 add util-linux-misc which might be required on alpine linux
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-20 10:47:11 +01:00
Simon L
ef4835fcef Merge pull request #2031 from nextcloud/automated/noid/psalm-baseline-update-1676866986
[Automated] Update psalm-baseline.xml
2023-02-20 08:59:06 +01:00
nextcloud-command
00293d3ac0 Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2023-02-20 04:23:05 +00:00
Simon L
7058cf2090 Merge pull request #2028 from nextcloud/enh/noid/adjust-readme
adjust readme a bit
2023-02-19 22:44:37 +01:00
Simon L
342a3b8b8f adjust readme a bit
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-19 22:43:21 +01:00
Simon L
98a32b1ccf fix detail
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-19 22:32:14 +01:00
Simon L
78db980b2f Merge pull request #2027 from nextcloud/enh/noid/improve-rp-docs
rp documentation - make apache_ip_binding documentation more explicit
2023-02-19 22:30:42 +01:00
Simon L
31ca661345 rp documentation - make apache_ip_binding documentation more explicit
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-19 22:15:23 +01:00
Simon L
e97aa44fe4 add a more complete dnsmasq guide
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-19 11:05:06 +01:00
Simon L
f97bfc7dd1 Merge pull request #2024 from Verhoeckx/patch-1
Add the directive ProxyPassReverse
2023-02-18 22:53:38 +01:00
Verhoeckx
758bc8b3ff Add the directive ProxyPassReverse
According to the official documentation of Apache the directive ProxyPassReverse should be added when Apache is being used as a reverse proxy. I have tested it and Nexctloud AIO seems to work just fine.

From the documentation:
"This directive lets Apache adjust the URL in the Location, Content-Location and URI headers on HTTP redirect responses. This is essential when Apache is used as a reverse proxy (or gateway) to avoid bypassing the reverse proxy because of HTTP redirects on the backend servers which stay behind the reverse proxy."

https://httpd.apache.org/docs/2.2/mod/mod_proxy.html#ProxyPassReverse


Signed-off-by: Verhoeckx <64807887+Verhoeckx@users.noreply.github.com>
2023-02-18 21:43:20 +01:00
Simon L
5ab67cea1e also overwrite db_name to fix db migration
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-18 19:03:26 +01:00
Simon L
4fd365764c Merge pull request #2018 from Leptopoda/patch-1
Fix typo
2023-02-18 16:57:47 +01:00
Nikolas Rimikis
a57185a34b Fix typo
Signed-off-by: Nikolas Rimikis <25266387+Leptopoda@users.noreply.github.com>
2023-02-18 14:27:52 +01:00
Zoey
60399acbc7 close #2014
Signed-off-by: Zoey <zoey@z0ey.de>
2023-02-17 16:49:25 +01:00
Simon L
6d2d054328 docker-aio-config should not be a volume by default
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-17 12:36:50 +01:00
Simon L
bc100b9fd8 Merge pull request #2009 from nextcloud/fix/2008/fix-database-migration
postgresql - improve database online check during the migration
2023-02-17 12:30:26 +01:00
Simon L
394b899578 postgresql - improve database online check during the migration
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-17 11:50:09 +01:00
Simon L
32124235ba increase to 4.4.1
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-17 11:29:45 +01:00
Simon L
7bb713eaaa increase to 4.4.0
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-16 19:17:04 +01:00
Simon L
0df1db6b8f Merge pull request #2005 from nextcloud/enh/2004/add-spinner-loader
add loader to login template
2023-02-16 19:16:11 +01:00
Simon L
5b2b60841d add loader to login template
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-16 19:14:09 +01:00
Simon L
e638aa3b89 Merge pull request #2002 from nextcloud/aio-helm-update
Helm Chart updates
2023-02-16 17:43:10 +01:00
szaimen
42c0dadb11 Helm Chart updates
Signed-off-by: GitHub <noreply@github.com>
2023-02-16 16:39:25 +00:00
Simon L
4362406587 fix the helm-update job
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-16 17:38:45 +01:00
Simon L
f1dff9b3e2 Merge pull request #2001 from nextcloud/aio-yaml-update
Yaml updates
2023-02-16 17:32:41 +01:00
szaimen
a6667496c7 Yaml updates
Signed-off-by: GitHub <noreply@github.com>
2023-02-16 16:31:28 +00:00
Simon L
355175cc36 Merge pull request #1990 from nextcloud/fix/1984/fix-docker-networks
connect containers only to custom network
2023-02-16 17:28:11 +01:00
Simon L
2ade84e7ab connect containers only to custom network
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-16 17:26:35 +01:00
Simon L
244424efee Merge pull request #1982 from nextcloud/enh/noid/improve-restore
also restore configuration.json even if the former restore failed
2023-02-16 17:25:09 +01:00
Simon L
775889edc4 Merge pull request #1981 from nextcloud/enh/noid/increase-free-disk-check
check size of config and only write back if space is sufficient
2023-02-16 17:24:35 +01:00
Simon L
8a23a1cb6b Merge pull request #1969 from nextcloud/enh/noid/improve-caddy
fix and hide a few caddy warnings
2023-02-16 17:23:43 +01:00
Simon L
e17dfd9e66 Merge pull request #1968 from nextcloud/enh/noid/fix-session-deletion
rm does not work if there are too many sessions
2023-02-16 17:21:59 +01:00
Simon L
de2c915bba update OO
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-16 17:19:02 +01:00
Simon L
40be1e1d07 Merge pull request #1999 from nextcloud/dependabot/docker/Containers/clamav/clamav/clamav-1.0.1-1
Bump clamav/clamav from 0.105.1-8 to 1.0.1-1 in /Containers/clamav
2023-02-16 17:17:44 +01:00
Simon L
e60dcdc2b3 Merge pull request #1998 from nextcloud/dependabot/docker/Containers/mastercontainer/caddy-2.6.4-alpine
Bump caddy from 2.6.3-alpine to 2.6.4-alpine in /Containers/mastercontainer
2023-02-16 17:17:26 +01:00
Simon L
90f49b128e Merge pull request #1997 from nextcloud/dependabot/docker/Containers/apache/caddy-2.6.4-alpine
Bump caddy from 2.6.3-alpine to 2.6.4-alpine in /Containers/apache
2023-02-16 17:17:10 +01:00
Simon L
2115e1dcf7 Merge pull request #1995 from nextcloud/dependabot/docker/Containers/nextcloud/php-8.0.28-fpm-alpine3.16
Bump php from 8.0.27-fpm-alpine3.16 to 8.0.28-fpm-alpine3.16 in /Containers/nextcloud
2023-02-16 17:16:55 +01:00
Simon L
554745ac13 Merge pull request #1994 from nextcloud/dependabot/docker/Containers/mastercontainer/php-8.1.16-fpm-alpine3.17
Bump php from 8.1.15-fpm-alpine3.17 to 8.1.16-fpm-alpine3.17 in /Containers/mastercontainer
2023-02-16 17:15:33 +01:00
Simon L
4f91809d41 Merge pull request #1980 from nextcloud/dependabot/docker/Containers/mastercontainer/docker-23.0.1-dind
Bump docker from 20.10.23-dind to 23.0.1-dind in /Containers/mastercontainer
2023-02-16 17:15:18 +01:00
Simon L
e52647caf3 Merge pull request #1979 from nextcloud/dependabot/docker/Containers/watchtower/alpine-3.17.2
Bump alpine from 3.17.1 to 3.17.2 in /Containers/watchtower
2023-02-16 17:14:56 +01:00
Simon L
c1f882b95f Merge pull request #1978 from nextcloud/dependabot/docker/Containers/borgbackup/alpine-3.17.2
Bump alpine from 3.17.1 to 3.17.2 in /Containers/borgbackup
2023-02-16 17:14:41 +01:00
Simon L
0710b64899 Merge pull request #1977 from nextcloud/dependabot/docker/Containers/postgresql/postgres-15.2-alpine
Bump postgres from 15.1-alpine to 15.2-alpine in /Containers/postgresql
2023-02-16 17:14:19 +01:00
Simon L
e7e3de0335 Merge pull request #1976 from nextcloud/dependabot/docker/Containers/domaincheck/alpine-3.17.2
Bump alpine from 3.17.1 to 3.17.2 in /Containers/domaincheck
2023-02-16 17:14:04 +01:00
Simon L
88c95e292b Merge pull request #2000 from nextcloud/enh/noid/multiarch
document multiarch containers
2023-02-16 17:03:57 +01:00
Simon L
73674c6167 document multiarch containers
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-16 17:02:44 +01:00
Simon L
e9497634b6 migration.md - adjust db-creation docs for psql 15
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-16 16:44:35 +01:00
dependabot[bot]
cf69a3114a Bump clamav/clamav from 0.105.1-8 to 1.0.1-1 in /Containers/clamav
Bumps clamav/clamav from 0.105.1-8 to 1.0.1-1.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-16 12:59:25 +00:00
dependabot[bot]
f7ec7da366 Bump caddy in /Containers/mastercontainer
Bumps caddy from 2.6.3-alpine to 2.6.4-alpine.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-16 12:59:11 +00:00
dependabot[bot]
2e9a908d07 Bump caddy from 2.6.3-alpine to 2.6.4-alpine in /Containers/apache
Bumps caddy from 2.6.3-alpine to 2.6.4-alpine.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-16 12:59:08 +00:00
Simon L
849c0c4c89 disable the tls-alpn challenge
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-15 19:36:26 +01:00
Simon L
43ef6cb056 traefik - the x-robots-tag should be set by nextcloud. dont overwrite it
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-15 18:30:01 +01:00
Simon L
194446fc71 check size of config and only write back if space is sufficient
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-15 17:11:23 +01:00
dependabot[bot]
63f2b4a3d9 Bump php in /Containers/nextcloud
Bumps php from 8.0.27-fpm-alpine3.16 to 8.0.28-fpm-alpine3.16.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-15 13:02:06 +00:00
dependabot[bot]
285aee962b Bump php in /Containers/mastercontainer
Bumps php from 8.1.15-fpm-alpine3.17 to 8.1.16-fpm-alpine3.17.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-15 13:01:00 +00:00
Simon L
6787d322cc also restore configuration.json even if the former restore failed
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-13 17:00:20 +01:00
dependabot[bot]
b7e593a64d Bump docker in /Containers/mastercontainer
Bumps docker from 20.10.23-dind to 23.0.1-dind.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-13 13:04:15 +00:00
dependabot[bot]
eb52264f3b Bump alpine from 3.17.1 to 3.17.2 in /Containers/watchtower
Bumps alpine from 3.17.1 to 3.17.2.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-13 13:04:15 +00:00
dependabot[bot]
93de08cd54 Bump alpine from 3.17.1 to 3.17.2 in /Containers/borgbackup
Bumps alpine from 3.17.1 to 3.17.2.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-13 13:04:00 +00:00
dependabot[bot]
d65e94b3b2 Bump postgres from 15.1-alpine to 15.2-alpine in /Containers/postgresql
Bumps postgres from 15.1-alpine to 15.2-alpine.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-13 13:03:56 +00:00
dependabot[bot]
0f38928dd8 Bump alpine from 3.17.1 to 3.17.2 in /Containers/domaincheck
Bumps alpine from 3.17.1 to 3.17.2.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-13 13:03:53 +00:00
Simon L
1dc69dca29 Match only host names and not ip-addresses
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-11 21:26:07 +01:00
Simon L
96f3ca2506 fix and hide a few caddy warnings
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-11 20:49:30 +01:00
Simon L
9c63e9707f rm does not work if there are too many sessions
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-11 19:30:02 +01:00
Simon L
feffba739a Helm Chart updates
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-11 15:18:13 +01:00
Simon L
8a0dda3002 add an additional step about removing the containers
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-11 15:14:16 +01:00
Simon L
df34ecb282 Merge pull request #1959 from nextcloud/aio-yaml-update
Yaml updates
2023-02-10 14:35:51 +01:00
szaimen
0dda394f5c Yaml updates
Signed-off-by: GitHub <noreply@github.com>
2023-02-10 13:22:54 +00:00
Simon L
86a8a2d2fd increase to 4.3.4
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-10 14:02:20 +01:00
Simon L
be2df389ab Merge pull request #1934 from nextcloud/enh/noid/handle-talk-internal-ports
helm - handle talk internal ports correctly and fix permissions for Nextcloud container
2023-02-10 13:59:15 +01:00
Simon L
a9f0cf6df5 no needs quotes as well
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-10 13:58:23 +01:00
Simon L
31d7fff62b Merge pull request #1957 from nextcloud/enh/noid/fix-fpm-settings
mastercontainer - increase max children and switch to pm dynamic
2023-02-10 13:48:23 +01:00
Simon L
6d7df693b3 Merge pull request #1954 from nextcloud/dependabot/docker/Containers/apache/caddy-2.6.3-alpine
Bump caddy from 2.6.2-alpine to 2.6.3-alpine in /Containers/apache
2023-02-10 13:44:28 +01:00
Simon L
cba398df2d Merge pull request #1955 from nextcloud/dependabot/docker/Containers/mastercontainer/caddy-2.6.3-alpine
Bump caddy from 2.6.2-alpine to 2.6.3-alpine in /Containers/mastercontainer
2023-02-10 13:44:09 +01:00
Simon L
398cf969ac mastercontainer - increase max children and switch to pm dynamic
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-10 13:42:03 +01:00
Simon L
8b8059b6d2 another one
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-09 13:11:02 +01:00
Simon L
23509fc18a improve detail
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-09 13:10:01 +01:00
dependabot[bot]
7be09e89d3 Bump caddy in /Containers/mastercontainer
Bumps caddy from 2.6.2-alpine to 2.6.3-alpine.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-09 12:04:08 +00:00
dependabot[bot]
b2c92d1b39 Bump caddy from 2.6.2-alpine to 2.6.3-alpine in /Containers/apache
Bumps caddy from 2.6.2-alpine to 2.6.3-alpine.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-09 12:03:57 +00:00
Simon L
cb527ad29c increase to 4.3.3
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-09 11:42:02 +01:00
Simon L
3209e69c1d Merge pull request #1952 from nextcloud/enh/noid/update-windows-docs
update windows documentation to use paths instead of volumes
2023-02-09 11:41:05 +01:00
Simon L
eb024f0460 update windows documentation to use paths instead of volumes
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-09 11:39:13 +01:00
Simon L
69c4df538a Merge pull request #1951 from nextcloud/aio-dependency-update
Dependency updates
2023-02-09 11:29:06 +01:00
Simon L
34c47c06cb Merge pull request #1950 from nextcloud/dependabot/docker/Containers/fulltextsearch/elasticsearch-7.17.9
Bump elasticsearch from 7.17.8 to 7.17.9 in /Containers/fulltextsearch
2023-02-09 11:28:40 +01:00
Simon L
ccbd7a847c Merge pull request #1949 from nextcloud/dependabot/docker/Containers/clamav/clamav/clamav-0.105.1-8
Bump clamav/clamav from 0.105.1-7 to 0.105.1-8 in /Containers/clamav
2023-02-09 11:28:23 +01:00
Simon L
9f2e2cdbb8 Merge pull request #1948 from nextcloud/enh/noid/rework-imaginary
imaginary - rework some things
2023-02-09 11:28:05 +01:00
Simon L
208b6a4960 Merge pull request #1947 from nextcloud/aio-yaml-update
Yaml updates
2023-02-09 11:26:42 +01:00
szaimen
57b921bc5e dependency updates
Signed-off-by: GitHub <noreply@github.com>
2023-02-08 12:15:56 +00:00
dependabot[bot]
3eba28888b Bump elasticsearch from 7.17.8 to 7.17.9 in /Containers/fulltextsearch
Bumps elasticsearch from 7.17.8 to 7.17.9.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-08 12:07:47 +00:00
dependabot[bot]
b68f1b9703 Bump clamav/clamav from 0.105.1-7 to 0.105.1-8 in /Containers/clamav
Bumps clamav/clamav from 0.105.1-7 to 0.105.1-8.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-08 12:04:40 +00:00
Simon L
c28952fc9c imaginary - rework some things
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-08 00:32:48 +01:00
szaimen
345f0f5f30 Yaml updates
Signed-off-by: GitHub <noreply@github.com>
2023-02-07 12:16:56 +00:00
Simon L
d7dc6bdea6 try to fix initial install
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-06 18:32:14 +01:00
Simon L
847b285e41 print out install errors
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-06 18:18:52 +01:00
Simon L
d141471bcd Merge pull request #1944 from nextcloud/enh/noid/fix-install-check
fix a few problems with new install check
2023-02-06 18:11:14 +01:00
Simon L
053a8e6a88 fix a few problems with new install check
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-06 18:10:45 +01:00
Simon L
9130a242e3 increase to 4.3.2
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-06 17:32:47 +01:00
Simon L
4d8b26d2f4 Merge pull request #1941 from nextcloud/dependabot/docker/Containers/mastercontainer/php-8.1.15-fpm-alpine3.17
Bump php from 8.1.14-fpm-alpine3.17 to 8.1.15-fpm-alpine3.17 in /Containers/mastercontainer
2023-02-06 17:30:59 +01:00
Simon L
097a04f2a1 Merge pull request #1940 from nextcloud/fix/1938/fix-multiple-major-versions-update
fix the cp commands for updating between multiple major versions
2023-02-06 17:30:23 +01:00
Simon L
a36141e02f Merge pull request #1939 from nextcloud/enh/1920/add-server_name-variable
collabora - add server-name variable
2023-02-06 17:30:07 +01:00
Simon L
51d94130ab Merge pull request #1918 from nextcloud/enh/noid/fail-if-appdata-was-not-created
also fail the installation if appdata could not get created
2023-02-06 17:29:36 +01:00
dependabot[bot]
f838a99508 Bump php in /Containers/mastercontainer
Bumps php from 8.1.14-fpm-alpine3.17 to 8.1.15-fpm-alpine3.17.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-06 12:15:44 +00:00
Simon L
20ca378b4c fix the cp commands for updating between multiple major versions
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-06 13:05:51 +01:00
Simon L
058cadb053 collabora - add server-name variable
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-06 12:52:54 +01:00
Simon L
d74ed475df adjust permissions for Nextcloud's datadir
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-04 17:07:49 +01:00
Simon L
a5f9ff9c74 helm - handle talk internal ports correctly
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-04 16:43:41 +01:00
Simon L
6889568c21 Merge pull request #1927 from nextcloud/aio-yaml-update
Yaml updates
2023-02-04 14:57:33 +01:00
szaimen
5c62640551 Yaml updates
Signed-off-by: GitHub <noreply@github.com>
2023-02-04 12:14:08 +00:00
Simon L
4c06f893fc add section about docker swarm and Ppodman
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-04 11:27:33 +01:00
Simon L
a84433a6d3 Merge pull request #1933 from nextcloud/enh/noid/adjust-rp-docs
adjust reverse proxy documentation to also talk about web server
2023-02-04 11:11:12 +01:00
Simon L
ae3b121823 fix a few more places
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-04 11:10:20 +01:00
Simon L
2192ea49b2 change the order of the entry sentence
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-04 11:04:29 +01:00
Simon L
f83864764f adjust reverse proxy documentation to also talk about web server
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-04 11:00:46 +01:00
Simon L
bb64990618 Merge pull request #1924 from nextcloud/enh/noid/improve-helm-networking
helm - add type: loadbalancer and remove apache_ip_binding again
2023-02-03 16:05:12 +01:00
Simon L
2e8f9bc5fa helm - add type: loadbalancer and remove apache_ip_binding again
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-03 16:02:43 +01:00
Simon L
2fbebaae5f also add quotes to talk and collabora
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-03 14:51:56 +01:00
Simon L
be7a1910ad increase to v4.3.1
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-03 11:57:41 +01:00
Simon L
3c69aac6ca Merge pull request #1915 from nextcloud/revert-1887-enh/490/multiarch-images
Revert "get multiarch repodigest"
2023-02-03 11:54:19 +01:00
Simon L
39415276db add list manifest
Signed-off-by: Simon L <szaimen@e.mail.de>

Co-authored-by: Zoey <zoey@z0ey.de>
Signed-off-by: Simon L. <szaimen@e.mail.de>
2023-02-03 11:38:42 +01:00
Simon L
6533018c6f ports 8081 needs to be expose for the talk container
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-03 10:48:30 +01:00
Simon L
cfbfe0438c Merge pull request #1912 from nextcloud/enh/noid/update-helm-chart
Helm Chart updates
2023-02-02 19:43:39 +01:00
Simon L
e18babbbde also fail the installation if appdata could not get created
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-02 19:41:41 +01:00
Simon L
f62d3ab0f7 Merge pull request #1893 from nextcloud/enh/noid/adjust-yes-values
adjust variables correctly
2023-02-02 19:17:31 +01:00
Simon L
5a959e9b07 Revert "get multiarch repodigest"
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-02 18:27:50 +01:00
Simon L
12358321d1 re-add initContainers
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-02 17:37:19 +01:00
Simon L
91a977e09e Helm Chart updates
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-02 15:45:27 +01:00
Simon L
f5c32a1a67 expose it not needed for containers that publish ports
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-02 15:37:03 +01:00
Simon L
9fe978fbe3 Merge pull request #1900 from nextcloud/dependabot/docker/Containers/collabora/collabora/code-22.05.10.1.1
Bump collabora/code from 22.05.9.3.1 to 22.05.10.1.1 in /Containers/collabora
2023-02-02 15:33:31 +01:00
Simon L
8ded5b59dc Merge pull request #1909 from nextcloud/enh/noid/add-expose-property
add expose property to containers definition
2023-02-02 15:33:05 +01:00
Simon L
c7519e3f49 try to fix the helm-update
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-02 15:32:39 +01:00
Simon L
21492e6b9d add expose property to containers definition
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-02 15:11:40 +01:00
Simon L
b428f3d1d8 Merge pull request #1897 from nextcloud/enh/noid/helm-readonly-volumes
try to remove readonly from global volumes automatically
2023-02-02 14:04:33 +01:00
Simon L
011356343f try to remove readonly from global volumes automatically
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-02 14:03:04 +01:00
Simon L
94f7425db9 Merge pull request #1899 from nextcloud/enh/noid/fix-database-helm-permisisons
fix database helm permissions
2023-02-02 13:14:08 +01:00
Simon L
484bc235e6 fix database helm permissions
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-02 13:13:45 +01:00
Simon L
5da794a8d8 Merge pull request #1896 from nextcloud/fix/noid/chown-postgres
fix(helm): chown database volume for postgres
2023-02-02 13:13:11 +01:00
dependabot[bot]
bbfb6e5dbe Bump collabora/code in /Containers/collabora
Bumps collabora/code from 22.05.9.3.1 to 22.05.10.1.1.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-02 12:06:48 +00:00
Richard Steinmetz
10e114c5f8 fix(helm): chown database volume for postgres
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
2023-02-02 12:48:36 +01:00
Simon L
26188f797d Merge pull request #1894 from nextcloud/fix/noid/nextcloud-deployment-read-only
fix(helm): don't mark ca certs volume as read only globally
2023-02-02 12:25:39 +01:00
Simon L
f8218735d1 also deleting global overwrite for apache
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-02 12:23:54 +01:00
Simon L
07aaf1fab4 adjust variables correctly
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-02 12:20:30 +01:00
Richard Steinmetz
a28806ad13 fix(helm): don't mark ca certs volume as read only globally
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
2023-02-02 12:17:34 +01:00
Simon L
7053447add Merge pull request #1891 from nextcloud/fix/noid/helm-chart-sources
fix(helm): refactor sources to a string array
2023-02-02 11:51:30 +01:00
Simon L
d7b0d07c71 fix elasticsearch
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-02 11:49:25 +01:00
Richard Steinmetz
fab569a613 fix(helm): refactor sources to a string array
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
2023-02-02 11:46:04 +01:00
Simon L
cc8d3f908a increase to 4.3.0
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-02 11:32:01 +01:00
Simon L
cab4a08655 Merge pull request #1890 from nextcloud/enh/1875/fix-backup-failing
fix daily backup running into conflict with elasticsearch
2023-02-02 11:30:18 +01:00
Simon L
df91f5d483 fix daily backup running into conflict with elasticsearch
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-02 11:28:29 +01:00
Simon L
c4107d1098 Merge pull request #1887 from nextcloud/enh/490/multiarch-images
get multiarch repodigest
2023-02-01 23:38:58 +01:00
Simon L
317a5b7823 Merge pull request #1889 from nextcloud/enh/noid/write-install-log
also write install log to logfile
2023-02-01 23:30:28 +01:00
Simon L
48c28d3613 get multiarch repodigest
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-01 23:19:15 +01:00
Simon L
cf38b9a73d also write install log to logfile
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-01 22:25:40 +01:00
Simon L
4ecead75b7 Merge pull request #1879 from nextcloud/enh/noid/allow-big-imaginary-images
imaginary - allow big images by default
2023-02-01 20:52:58 +01:00
Simon L
f667c92398 Merge pull request #1882 from nextcloud/dependabot/docker/Containers/imaginary/nextcloud/imaginary-20230201
Bump nextcloud/imaginary from 20230101 to 20230201 in /Containers/imaginary
2023-02-01 19:16:25 +01:00
Simon L
fb1a3fcd3b Merge pull request #1848 from nextcloud/enh/noid/improve-helm-update
Fix and improve helm update script
2023-02-01 19:04:46 +01:00
Simon L
be3798401c address review
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-01 18:58:19 +01:00
Simon L
0ea229e19a add volume permission workaround
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-01 17:04:40 +01:00
Simon L
b13a25107a Merge pull request #1883 from nextcloud/aio-dependency-update
Dependency updates
2023-02-01 13:29:27 +01:00
szaimen
bda83ffa31 dependency updates
Signed-off-by: GitHub <noreply@github.com>
2023-02-01 12:18:39 +00:00
dependabot[bot]
64458c8931 Bump nextcloud/imaginary in /Containers/imaginary
Bumps nextcloud/imaginary from 20230101 to 20230201.

---
updated-dependencies:
- dependency-name: nextcloud/imaginary
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-01 12:12:49 +00:00
Simon L
c8576044b2 change chart version to v2
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-01 12:51:53 +01:00
Simon L
133b149ee3 allow to change the size of each volume separately
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-01 12:47:06 +01:00
Simon L
33fb628ce5 imaginary - allow big images by default
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-02-01 11:38:59 +01:00
Simon L
f90dded674 Merge pull request #1877 from nextcloud/dependabot/github_actions/docker/build-push-action-4
Bump docker/build-push-action from 3 to 4
2023-01-31 19:01:34 +01:00
Simon L
d6692f8b93 Merge pull request #1876 from nextcloud/dependabot/docker/Containers/talk/ubuntu-focal-20230126
Bump ubuntu from focal-20221130 to focal-20230126 in /Containers/talk
2023-01-31 18:59:13 +01:00
dependabot[bot]
57f182f1e5 Bump docker/build-push-action from 3 to 4
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3 to 4.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v3...v4)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-31 12:04:52 +00:00
dependabot[bot]
7c05f18573 Bump ubuntu from focal-20221130 to focal-20230126 in /Containers/talk
Bumps ubuntu from focal-20221130 to focal-20230126.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-31 12:03:57 +00:00
Simon L
5ba7a3f86a also add libtool
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-31 00:37:43 +01:00
Simon L
8824a8471b add ghostscript fonts
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-31 00:23:23 +01:00
Simon L
b6c3a777b0 allow to adjust all volume sizes
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-30 21:52:02 +01:00
Simon L
6ece012680 Merge pull request #1865 from antipiot/patch-1
allow to copy the command to install docker
2023-01-30 20:52:21 +01:00
Jo
225ff3814d Update readme.md
Co-authored-by: Zoey <zoey@z0ey.de>
Signed-off-by: Jo <jonassauge@gmail.com>
2023-01-30 19:26:55 +01:00
Jo
e31d4f25ef Update readme.md
Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Jo <jonassauge@gmail.com>
2023-01-30 17:55:19 +01:00
Simon L
d025ee5e57 Merge pull request #1869 from nextcloud/disallow-watchtower
Disallow Watchtower to update AIO Container (exept Mastercontainer)
2023-01-30 15:49:51 +01:00
Simon L
ef397a9df1 add linebreak
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-30 15:33:12 +01:00
Zoey
f5616cd618 Disallow Watchtower to update AIO Container (exept Mastercontainer)
See: https://containrrr.dev/watchtower/container-selection/#monitor_only

Signed-off-by: Zoey <zoey@z0ey.de>
2023-01-30 14:54:31 +01:00
Simon L
9d6690e11c Merge pull request #1868 from nextcloud/dependabot/github_actions/ludeeus/action-shellcheck-2.0.0
Bump ludeeus/action-shellcheck from 1.1.0 to 2.0.0
2023-01-30 13:58:55 +01:00
Simon L
065bb229ba Merge pull request #1867 from nextcloud/dependabot/docker/Containers/watchtower/containrrr/watchtower-1.5.3
Bump containrrr/watchtower from 1.5.1 to 1.5.3 in /Containers/watchtower
2023-01-30 13:58:19 +01:00
Simon L
69a5621c86 Merge pull request #1866 from nextcloud/dependabot/docker/Containers/apache/httpd-2.4.55-alpine3.17
Bump httpd from 2.4.54-alpine3.17 to 2.4.55-alpine3.17 in /Containers/apache
2023-01-30 13:58:01 +01:00
dependabot[bot]
fb411120c1 Bump ludeeus/action-shellcheck from 1.1.0 to 2.0.0
Bumps [ludeeus/action-shellcheck](https://github.com/ludeeus/action-shellcheck) from 1.1.0 to 2.0.0.
- [Release notes](https://github.com/ludeeus/action-shellcheck/releases)
- [Commits](https://github.com/ludeeus/action-shellcheck/compare/1.1.0...2.0.0)

---
updated-dependencies:
- dependency-name: ludeeus/action-shellcheck
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-30 12:19:48 +00:00
dependabot[bot]
abd956612d Bump containrrr/watchtower from 1.5.1 to 1.5.3 in /Containers/watchtower
Bumps containrrr/watchtower from 1.5.1 to 1.5.3.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-30 12:16:45 +00:00
dependabot[bot]
88f2b398a4 Bump httpd in /Containers/apache
Bumps httpd from 2.4.54-alpine3.17 to 2.4.55-alpine3.17.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-30 12:16:26 +00:00
Jo
3058bf03ec allow to copy the command to install docker
Signed-off-by: Jo <jonassauge@gmail.com>
2023-01-30 10:19:22 +01:00
Simon L
7d36204397 allow to adjust the volumes
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-29 11:03:18 +01:00
Simon L
83c68da0a0 fix permissions?
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-28 22:29:41 +01:00
Simon L
405162e103 Fix and improve helm update script
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-28 17:33:44 +01:00
Simon L
3102dbfaeb add curl back
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-27 21:52:37 +01:00
Zoey
4e74052c20 migrate mastercontainer to alpine (#1577) 2023-01-27 21:36:53 +01:00
Zoey
123c1be6b7 migrate apache container to alpine (#1573) 2023-01-27 19:43:55 +01:00
Simon L
7a126a96d9 svg does not work with imaginary in my testing
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-27 18:57:35 +01:00
Simon L
98f688a63a Merge pull request #1845 from nextcloud/enh/noid/accept-new-oci-format
also accept application/vnd.oci.image.index.v1+json for newer buildx …
2023-01-27 18:36:14 +01:00
Simon L
2469461a3c also accept application/vnd.oci.image.index.v1+json for newer buildx versions
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-27 18:33:28 +01:00
Simon L
ccf8904c0a Merge pull request #1835 from nextcloud/enh/noid/imaginary-add-mimetypes
imaginary - allow further mimetypees out-of-the-box
2023-01-27 15:38:57 +01:00
Simon L
f5722897e5 imaginary - allow further mimetypees out-of-the-box
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-27 15:12:42 +01:00
Simon L
578f02a818 Merge pull request #1843 from nextcloud/enh/noid/improve-cloudflare-upload-limit
make cloudflare upload limit for explicit
2023-01-27 14:17:32 +01:00
Simon L
4fd54aa53e make cloudflare upload limit for explicit
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-27 13:55:15 +01:00
Simon L
a96b7314bd Merge pull request #1840 from nextcloud/dependabot/docker/Containers/collabora/collabora/code-22.05.9.3.1
Bump collabora/code from 22.05.9.2.1 to 22.05.9.3.1 in /Containers/collabora
2023-01-26 23:40:17 +01:00
Simon L
b963126a40 Merge pull request #1839 from tyleraharrison/patch-1
follow-links should be follow-link
2023-01-26 23:39:45 +01:00
Simon L
6179f7a609 fix other places as well
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-26 23:39:00 +01:00
dependabot[bot]
097cc33105 Bump collabora/code in /Containers/collabora
Bumps collabora/code from 22.05.9.2.1 to 22.05.9.3.1.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-26 12:05:01 +00:00
tyleraharrison
56a642163a Fix typo in migration.md
`--get-links` -> `--get-link`

Signed-off-by: tyleraharrison <tyleraharrison@gmail.com>
2023-01-26 03:51:36 -06:00
Simon L
91ea705d34 Merge pull request #1834 from nextcloud/enh/noid/add-clamav-explanation
add explanation for clamav
2023-01-25 15:55:54 +01:00
Simon L
d2efe324af Merge pull request #1754 from nextcloud/rework-traefik-example
Rework the traefik example
2023-01-25 14:07:47 +01:00
hunhejj
abd0dc1f09 Add disclaimer
Signed-off-by: hunhejj <hunhejj@gmail.com>

Update reverse-proxy.md
2023-01-25 13:32:25 +01:00
hunhejj
841f6596aa Fixup documentation
Signed-off-by: hunhejj <hunhejj@gmail.com>
2023-01-25 13:31:40 +01:00
hunhejj
b3477bad1b Rework the Traefik example
Make the Traefik example more complete.

Signed-off-by: hunhejj <hunhejj@gmail.com>
2023-01-25 13:31:40 +01:00
Simon L
7bad651a76 add explanation for clamav
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-25 12:48:49 +01:00
Simon L
df67a13198 add direct link for Synology
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-24 13:58:20 +01:00
Simon L
754c374a38 Merge pull request #1831 from nextcloud/aio-dependency-update
Dependency updates
2023-01-24 13:41:17 +01:00
szaimen
de79b71684 dependency updates
Signed-off-by: GitHub <noreply@github.com>
2023-01-24 12:17:14 +00:00
Simon L
a3793296de Merge pull request #1830 from nextcloud/dependabot/docker/Containers/mastercontainer/docker-20.10.23-dind
Bump docker from 20.10.22-dind to 20.10.23-dind in /Containers/mastercontainer
2023-01-24 13:08:16 +01:00
dependabot[bot]
62bf50d160 Bump docker in /Containers/mastercontainer
Bumps docker from 20.10.22-dind to 20.10.23-dind.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-24 12:05:56 +00:00
Simon L
1e6787cb64 Merge pull request #1584 from nextcloud/enh/1396/update-postgres
upgrade postgres to 15
2023-01-24 12:55:47 +01:00
Simon L
4a1b8ea45c Merge pull request #1785 from nextcloud/fix/1783/fix-clamav-on-arm64
clamav should never be enabled on arm64
2023-01-24 12:55:25 +01:00
Simon L
4a6b078c97 Merge pull request #1816 from nextcloud/enh/1569/recognize
remove gcompat again as it seems to break recognize
2023-01-24 12:53:45 +01:00
Simon L
fa48707a0d Merge pull request #1817 from nextcloud/enh/588/add-backup-app-requirements
add libpg-dev and pgsql for backup app
2023-01-24 12:53:21 +01:00
Simon L
6ae1222feb Merge pull request #1823 from nextcloud/enh/noid/composer-add-minor-version-back
composer - add back the minor versions instead of wildcards
2023-01-24 12:52:57 +01:00
Simon L
d7cb7ed13e Merge pull request #1794 from nextcloud/dependabot/docker/Containers/redis/redis-7.0.8-alpine
Bump redis from 7.0.7-alpine to 7.0.8-alpine in /Containers/redis
2023-01-24 12:52:26 +01:00
Simon L
ed73d4f75d Merge pull request #1791 from nextcloud/enh/noid/omit-dind-version
change dind image to omit the alpine version
2023-01-24 12:51:56 +01:00
FreDTV
7f03b4efda Add Synology instructions (#1813) 2023-01-24 12:49:09 +01:00
Simon L
b2fe902cd3 Merge pull request #1825 from nextcloud/enh/noid/add-storage-options
add section about storage options
2023-01-24 12:31:16 +01:00
Simon L
c09f9f6178 add hint about changing Nextcloud's Datadir in additional places
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-24 12:17:15 +01:00
Simon L
2758bea52e Merge pull request #1822 from DenuxPlays/denux/increase_buffer_size
increase H2WindowSize limit (Reverse Proxy documentation)
2023-01-24 11:58:04 +01:00
Simon L
1aafd9f974 Merge pull request #1818 from nextcloud/enh/noid/disrecommended-providers
Add a disrecommended VPS providers section
2023-01-24 11:57:15 +01:00
Simon L
a9c258ea63 Merge pull request #1827 from nextcloud/enh/noid/add-recommended-providers
add section about recommended vps
2023-01-24 11:56:43 +01:00
Simon L
a96cae9035 add section about storage options
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-24 11:42:19 +01:00
Simon L
aa97096948 add section about recommended vps
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-24 11:37:08 +01:00
Simon L
1035314023 Add a disrecommended VPS providers section
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-24 11:34:30 +01:00
Simon L
b664f7c143 Merge pull request #1820 from nextcloud/npm-docs
update npm docs
2023-01-24 11:32:49 +01:00
Simon L
adee1abf32 Merge pull request #1819 from nextcloud/enh/noid/improve-cloudflare-collabora-docs
cloudflare - improve hint regarding cloudflare
2023-01-24 11:30:57 +01:00
Simon L
376369d924 Merge pull request #1812 from nextcloud/nginx-proxy-docs-change
nginx proxy docs changes
2023-01-24 11:13:16 +01:00
Simon L
ba740e5a36 Merge pull request #1826 from nextcloud/automated/noid/psalm-baseline-update-1674534084
Update psalm-baseline.xml
2023-01-24 11:10:17 +01:00
Simon L
56f0cfd914 fix psalm
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-24 11:07:08 +01:00
nextcloud-command
d3794f5f88 Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2023-01-24 04:21:24 +00:00
Simon L
205b2c00be composer - add back the minor versions instead of wildcards
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-22 19:32:19 +01:00
-Denux
43227cf6f7 undo nginx changes (handled in seperated pr)
Signed-off-by: -Denux <83671398+DenuxPlays@users.noreply.github.com>
2023-01-22 17:39:06 +01:00
-Denux
8227207490 increased H2WindowSize limit
Signed-off-by: -Denux <83671398+DenuxPlays@users.noreply.github.com>
2023-01-22 17:32:06 +01:00
Zoey
9396264c92 update npm docs
Signed-off-by: Zoey <zoey@z0ey.de>
2023-01-21 23:44:02 +01:00
Simon L
9f985186d5 cloudflare - improve hint regarding cloudflare
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-21 16:33:01 +01:00
Simon L
7080ac9832 add libpg-dev and pgsql for backup app
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-21 15:20:46 +01:00
Simon L
ea0d70fb0f remove gcompat again as it seems to break recognize
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-21 15:09:54 +01:00
Simon L
bcdcab4d8a clamav should never be enabled on arm64
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-21 00:40:28 +01:00
Zoey
b50dcb669e nginx proxy docs changes
- add more proxy headers
- change client_body_buffer_size
- enable ssl_early_data

Signed-off-by: Zoey <zoey@z0ey.de>
2023-01-19 20:44:10 +01:00
Simon L
570b4820f8 Merge pull request #1809 from nextcloud/nginx-timeout-note
note on proxy_read_timeout
2023-01-19 19:03:59 +01:00
Zoey
77922954b4 add suggestion
Signed-off-by: Zoey <zoey@z0ey.de>
2023-01-19 17:33:35 +01:00
Zoey
e845fd24a2 note on proxy_read_timeout
Signed-off-by: Zoey <zoey@z0ey.de>
2023-01-19 16:43:38 +01:00
Simon L
946e214eb4 Merge pull request #1803 from nextcloud/enh/1801/docker-socket-path
adjust macOS docs about DOCKER_SOCKET_PATH
2023-01-18 21:35:09 +01:00
Simon L
3b1334324d adjust macOS docs about DOCKER_SOCKET_PATH
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-18 20:54:50 +01:00
Simon L
d5216d3978 update 2nd screenshot of synology RP
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-18 19:48:08 +01:00
Simon L
f80812f1dc Merge pull request #1799 from nextcloud/strato-note
Add note on Strato
2023-01-18 17:45:55 +01:00
Zoey
324edf43c1 add suggestion
Signed-off-by: Zoey <zoey@z0ey.de>
2023-01-18 17:17:29 +01:00
Zoey
7a18f865fe add note on strato vps
Signed-off-by: Zoey <zoey@z0ey.de>
2023-01-18 16:29:13 +01:00
dependabot[bot]
0c73019092 Bump redis from 7.0.7-alpine to 7.0.8-alpine in /Containers/redis
Bumps redis from 7.0.7-alpine to 7.0.8-alpine.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-18 12:04:58 +00:00
Simon L
98cf71861f change dind image to omit the alpine version
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-17 23:23:37 +01:00
Simon L
5d3c858064 Revert "change dind image to omit the alpine version"
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-17 23:23:15 +01:00
Simon L
9645abcecc change dind image to omit the alpine version
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-17 23:22:40 +01:00
Simon L
a415d71013 add a few more hints regarding the chosen NEXTCLOUD_DATADIR in migration.md
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-17 19:50:31 +01:00
Simon L
e4438bffcb change command for texteditor instructions as well
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-17 19:49:55 +01:00
ManOki
4c691debf5 add docker cp command to prevent host file paths like /_data/ (#1773) 2023-01-17 18:22:37 +01:00
Simon L
7c3ac06b49 add new commands
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-17 16:19:48 +01:00
Simon L
9065e07a23 upgrade postgres to 15
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-17 15:44:45 +01:00
Simon L
b249e02d53 Merge pull request #1781 from nextcloud/enh/noid/update-nc
update Nextcloud to 25.0.3
2023-01-17 11:20:30 +01:00
Simon L
a09620cf53 update Nextcloud to 25.0.3
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-17 11:13:58 +01:00
Simon L
6a13cc2e2e Merge pull request #1777 from meonkeys/patch-1
readme: clarify OS package env var
2023-01-17 10:36:18 +01:00
Simon L
b24024f456 adjust links
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-17 10:29:46 +01:00
Adam Monsen
455ada94e6 readme: clarify OS package env var
Signed-off-by: Adam Monsen <haircut@gmail.com>
2023-01-16 21:57:58 -08:00
Simon L
912dfdb982 Merge pull request #1776 from DenuxPlays/denux/reverse_proxy_improvement
Prevent slow upload speeds (Reverse Proxy documentation)
2023-01-16 18:08:46 +01:00
-Denux
843168fefe Apply suggestions from code review
Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: -Denux <83671398+DenuxPlays@users.noreply.github.com>
2023-01-16 17:15:09 +01:00
-Denux
04466f0c42 added h2 window size 2023-01-16 17:05:40 +01:00
Simon L
39d12e8766 Merge pull request #1774 from nextcloud/enh/noid/improve-sudo-docs
add note on sudo for windows and docker rootless
2023-01-16 16:49:29 +01:00
Simon L
cace2c0414 add note on sudo for windows and docker rootless
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-16 16:40:54 +01:00
Simon L
59cd8a13a8 Merge pull request #1772 from nextcloud/enh/noid/clouflare-talk-hpb-note
cloudflare - add note about the hpb for talk
2023-01-16 09:14:53 +01:00
Simon L
332880d90a cloudflare - add note about the hpb for talk
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-15 23:30:38 +01:00
Simon L
0a432d4d5b Merge pull request #1771 from nextcloud/enh/noid/cloudflare-cert-issuing
cloudflare - add note about possible problems with cert issuing
2023-01-15 23:28:35 +01:00
Simon L
bcf9e65116 cloudflare - add note about possible problems with cert issuing
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-15 23:24:56 +01:00
Simon L
ee77c2ec22 Merge pull request #1770 from nextcloud/enh/noid/cloudflare-hsts-header
cloudflare - add note about missing hsts header
2023-01-15 23:22:56 +01:00
Simon L
05500e6f31 Merge pull request #1769 from nextcloud/enh/noid/cloudflare-domain-validation
add further note about cloudflare and domain validation
2023-01-15 23:22:44 +01:00
Simon L
c9e2327cf2 cloudflare - add note about missing hsts header
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-15 23:06:32 +01:00
Simon L
fa88ec3598 add further note about cloudflare and domain validation
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-15 23:01:45 +01:00
Simon L
8f270db5d6 increase to 4.2.0
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-15 18:50:34 +01:00
Simon L
27060ec992 Merge pull request #1578 from nextcloud/enh/205/migrate-borg
migrate borgbackup container to alpine
2023-01-15 18:30:53 +01:00
Simon L
ab3ef06581 migrate borgbackup to alpine
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-15 18:27:12 +01:00
Simon L
1eac2fc9c3 Merge pull request #1767 from nextcloud/enh/noid/alpine-update
alpine - remove the update arg
2023-01-15 18:25:51 +01:00
Simon L
de3ec19221 alpine - remove the update arg
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-15 18:22:31 +01:00
Simon L
af3d99dafc Merge pull request #1764 from nextcloud/enh/noid/make-reverse-proxy-more-verbose
make more verbose that reverse proxy setup is different
2023-01-15 18:18:14 +01:00
Simon L
bd2b4dc65e Merge pull request #1763 from nextcloud/enh/noid/change-docker-install-notes
change instructions on how to install docker
2023-01-15 18:17:42 +01:00
Simon L
9bc465bd0a Merge pull request #1585 from nextcloud/enh/1396/update-redis
update redis to v7
2023-01-15 17:57:09 +01:00
Simon L
5a266bcaae Merge pull request #1736 from nextcloud/enh/noid/borg-prefix
borg - substitute prefix with glob-archives
2023-01-15 17:56:49 +01:00
Simon L
1e6e01b8a5 update redis to v7
Signed-off-by: Simon L <szaimen@e.mail.de>
Co-Authored-By: Zoey <zoey@z0ey.de>
2023-01-15 17:53:18 +01:00
Simon L
71700fadb7 Merge pull request #1755 from nextcloud/aio-dependency-update
Dependency updates
2023-01-15 17:48:13 +01:00
Simon L
c7b5c346aa exclusion of some dependencies is not needed anymore
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-15 17:46:38 +01:00
Simon L
2e70efc610 make more verbose that reverse proxy setup is different
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-15 15:08:00 +01:00
Simon L
8560570ef9 change instructions on how to install docker
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-15 15:06:35 +01:00
Simon L
c2f3a26be0 add cloudflare notes to bug-report template
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-15 14:40:17 +01:00
szaimen
7b8476ed54 dependency updates
Signed-off-by: GitHub <noreply@github.com>
2023-01-15 12:13:38 +00:00
Simon L
55116a9608 Merge pull request #1750 from nextcloud/cloudflare-notes
Add Notes on Cloudflare to readme
2023-01-14 22:36:24 +01:00
Zoey
d47f1bc403 Update readme.md
Signed-off-by: Zoey <zoey@z0ey.de>
2023-01-14 22:00:59 +01:00
Zoey
ca685e4de2 add suggestion
Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Zoey <zoey@z0ey.de>
2023-01-14 22:00:36 +01:00
Simon L
38d7ae8cbe Merge pull request #1756 from nextcloud/enh/1744/add-datadir-hint
add a hint that NEXTCLOUD_DATADIR needs to be specified before the fi…
2023-01-14 19:00:20 +01:00
Simon L
9d60d06693 add a hint that NEXTCLOUD_DATADIR needs to be specified before the first starutp
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-14 13:32:34 +01:00
Simon L
37ece73dc2 Merge pull request #1741 from hunhejj/patch-4
Rewrite Traefik examples using YAML
2023-01-14 11:10:41 +01:00
hunhejj
bd68ff4c86 Add hint for using a YAML to TOML converter
Signed-off-by: hunhejj <hunhejj@gmail.com>
2023-01-14 10:24:01 +01:00
Zoey
c58ffa2d51 Add Notes on Cloudflare to readme
Signed-off-by: Zoey <zoey@z0ey.de>
2023-01-13 21:48:38 +01:00
Simon L
54aba036bd Merge pull request #1743 from nextcloud/enh/noid/update-dependencies
fix dependency-update workflow
2023-01-13 15:22:59 +01:00
Simon L
b762104e23 update shellcheck version
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-13 15:22:12 +01:00
Simon L
5beb3965bf try to fix dependency-update workflow
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-13 15:17:27 +01:00
Simon L
fb91f72c43 Merge pull request #1742 from nextcloud/enh/1734/sig-proxy
add an explanation of `--sig-proxy=false`
2023-01-13 14:25:27 +01:00
Simon L
065e7043ee add an explanation of --sig-proxy=false
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-13 12:46:31 +01:00
hunhejj
ccfd840a06 Codestyle fix
Signed-off-by: hunhejj <hunhejj@gmail.com>
2023-01-13 09:01:03 +01:00
hunhejj
a0fe0bbaeb Rewrite Traefik examples using yml config
Signed-off-by: hunhejj <hunhejj@gmail.com>
2023-01-13 08:58:31 +01:00
Simon L
8b86294936 borg - substitute prefix with glob-archives
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-12 23:56:41 +01:00
Simon L
b5f9c860b5 Merge pull request #1732 from ManOki/redis_warning_hint
redis: add hint to wiki if overcommit disabled
2023-01-12 23:33:37 +01:00
Simon L
b128dbd6a2 Merge pull request #1733 from hunhejj/patch-3
Fix the Traefik example
2023-01-12 23:26:08 +01:00
Simon L
b1f1b47b25 improve the pr message of helm-update
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-12 23:10:19 +01:00
hunhejj
a914a29c26 Add the X-Robots-Tag to the response header
Signed-off-by: hunhejj <hunhejj@gmail.com>
2023-01-12 21:00:55 +01:00
hunhejj
afb231bc9a Migrate deprecated sslRedirect
Signed-off-by: hunhejj <hunhejj@gmail.com>
2023-01-12 20:51:04 +01:00
ManOki
f7cc065ac9 Update Containers/redis/start.sh, add quotes
Co-authored-by: Zoey <zoey@z0ey.de>
Signed-off-by: ManOki <ManOki@users.noreply.github.com>
2023-01-12 20:32:55 +01:00
ManOki
0ca8a8bfbc Update Containers/redis/start.sh, add quotes
Co-authored-by: Zoey <zoey@z0ey.de>
Signed-off-by: ManOki <ManOki@users.noreply.github.com>
2023-01-12 20:32:47 +01:00
ManOki
af165ea504 Update Containers/redis/start.sh, add quotes
Co-authored-by: Zoey <zoey@z0ey.de>
Signed-off-by: ManOki <ManOki@users.noreply.github.com>
2023-01-12 20:32:40 +01:00
ManOki
438a8547b4 redis: add hint to wiki if overcommit disabled
Signed-off-by: ManOki <ManOki@users.noreply.github.com>
2023-01-12 20:16:02 +01:00
Simon L
d66002a409 Merge pull request #1708 from nextcloud/fix/1702/fix-enabling-apps
fix the apps not getting enabled on migration
2023-01-12 14:42:42 +01:00
Simon L
6eeba9d9cb the helm chart should be at 4.0.1 currently
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-12 14:15:58 +01:00
Simon L
8281abec33 address review
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-12 13:59:10 +01:00
Simon L
514652f8c3 Merge pull request #1706 from nextcloud/enh/noid/improve-logout-button
fix to position of the log-out button
2023-01-12 13:58:08 +01:00
Simon L
8f48ed59d5 Merge pull request #1696 from nextcloud/enh/1677/improve-cloudflare
Add hint about Cloudflare Rocket Loader and Rename Cloudflare Argo Tu…
2023-01-12 13:57:49 +01:00
Simon L
c03fde1ebd Merge pull request #1695 from nextcloud/enh/1694/improve-fts
allow to make fulltextsearch:index issues easier to debug
2023-01-12 13:56:02 +01:00
Simon L
6b3d346530 Merge pull request #1689 from nextcloud/dependabot/docker/Containers/nextcloud/php-8.0.27-fpm-alpine3.16
Bump php from 8.0.26-fpm-alpine3.16 to 8.0.27-fpm-alpine3.16 in /Containers/nextcloud
2023-01-12 13:55:24 +01:00
Simon L
0badbda49b Merge pull request #1688 from nextcloud/dependabot/docker/Containers/mastercontainer/php-8.1.14-apache-bullseye
Bump php from 8.1.13-apache-bullseye to 8.1.14-apache-bullseye in /Containers/mastercontainer
2023-01-12 13:55:08 +01:00
Simon L
06d3f3b52e Merge pull request #1710 from nextcloud/dependabot/docker/Containers/watchtower/alpine-3.17.1
Bump alpine from 3.16.3 to 3.17.1 in /Containers/watchtower
2023-01-12 13:54:40 +01:00
Simon L
33fa8ef9b3 Merge pull request #1711 from nextcloud/dependabot/docker/Containers/domaincheck/alpine-3.17.1
Bump alpine from 3.16.3 to 3.17.1 in /Containers/domaincheck
2023-01-12 13:54:19 +01:00
Simon L
8685cafe2e Merge pull request #1721 from nextcloud/dependabot/docker/Containers/apache/debian-bullseye-20230109-slim
Bump debian from bullseye-20221219-slim to bullseye-20230109-slim in /Containers/apache
2023-01-12 13:54:01 +01:00
Simon L
afb4776c21 Merge pull request #1722 from nextcloud/dependabot/docker/Containers/borgbackup/debian-bullseye-20230109-slim
Bump debian from bullseye-20221219-slim to bullseye-20230109-slim in /Containers/borgbackup
2023-01-12 13:53:48 +01:00
Simon L
49db3868ef Merge pull request #1726 from hunhejj/patch-2
Remove the reference to an unknown middleware
2023-01-11 18:45:30 +01:00
hunhejj
55047a9da7 Remove the reference to an unknown middleware
Signed-off-by: hunhejj <hunhejj@gmail.com>
2023-01-11 18:40:46 +01:00
Simon L
8984a7063b Merge pull request #1719 from hunhejj/patch-1
Fix the middleware name in the Traefik doc
2023-01-11 17:31:14 +01:00
dependabot[bot]
c843f2a59a Bump debian in /Containers/apache
Bumps debian from bullseye-20221219-slim to bullseye-20230109-slim.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-11 12:10:19 +00:00
dependabot[bot]
e0ed1ee554 Bump debian in /Containers/borgbackup
Bumps debian from bullseye-20221219-slim to bullseye-20230109-slim.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-11 12:10:19 +00:00
hunhejj
35db5d2467 Fix the middleware name in the Traefik doc
Signed-off-by: hunhejj <hunhejj@gmail.com>
2023-01-11 10:11:09 +01:00
Simon L
32b2e6d2ed Merge pull request #1716 from nextcloud/resolver-nginx-docs
add note to resolver in nginx reverse proxy docs
2023-01-11 08:04:19 +01:00
Zoey
4ea03db32e Update reverse-proxy.md
Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Zoey <zoey@z0ey.de>
2023-01-11 06:02:46 +01:00
Zoey
1639e05338 add note to resolver in nginx reverse proxy docs
Signed-off-by: Zoey <zoey@z0ey.de>
2023-01-10 21:07:05 +01:00
dependabot[bot]
05761ce5e8 Bump alpine from 3.16.3 to 3.17.1 in /Containers/domaincheck
Bumps alpine from 3.16.3 to 3.17.1.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-10 12:05:39 +00:00
dependabot[bot]
7b567d5231 Bump alpine from 3.16.3 to 3.17.1 in /Containers/watchtower
Bumps alpine from 3.16.3 to 3.17.1.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-10 12:05:37 +00:00
Simon L
29b7515c65 allow to make fulltextsearch:index issues easier to debug
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-10 12:46:49 +01:00
Simon L
7d926de2a1 fix the apps not getting enabled on migration
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-10 12:34:16 +01:00
Simon L
16c5f601f2 fix to position of the log-out button
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-10 00:30:06 +01:00
Simon L
3738f645a4 Add hint about Cloudflare Rocket Loader and Rename Cloudflare Argo Tunnel to Cloudflare Tunnel
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-07 20:15:53 +01:00
Simon L
910b72e4c0 improve wording of bugreport template
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-07 16:23:05 +01:00
Simon L
f85b4c5f2d how to use github is not needed for AIO
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-07 16:21:34 +01:00
dependabot[bot]
16f5a30784 Bump php in /Containers/nextcloud
Bumps php from 8.0.26-fpm-alpine3.16 to 8.0.27-fpm-alpine3.16.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-06 16:58:07 +00:00
dependabot[bot]
2a151b71fa Bump php in /Containers/mastercontainer
Bumps php from 8.1.13-apache-bullseye to 8.1.14-apache-bullseye.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-06 16:57:56 +00:00
Simon L
0588a3391c Merge pull request #1574 from nextcloud/helm-chart
Create Helm-chart
2023-01-06 17:56:56 +01:00
root
2c5fa27afb Create Helm-chart
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-06 16:59:32 +01:00
Simon L
0810904d41 fix token
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-05 19:32:38 +01:00
Simon L
353b65fa09 fix update-yaml as well
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-05 19:29:55 +01:00
Simon L
50ed6a1ed8 try to fix the workflow
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-05 19:28:19 +01:00
Simon L
cf35a3a391 disable ex options again
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-05 19:24:24 +01:00
Simon L
3cf99a96b2 add verbose output for update-yaml
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-05 19:20:58 +01:00
Simon L
6641cb6382 add update-helm script which makes it easier to test things
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-05 17:46:41 +01:00
Simon L
62a3740a53 improve manual-install update docs
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-05 12:11:12 +01:00
Simon L
1605431827 substitute borg --progress by borg -v
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-04 17:10:21 +01:00
Simon L
d8f24b8862 try to fix the borg check
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-04 16:49:47 +01:00
Simon L
db9f88945c increase to v4.1.0
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-04 16:22:38 +01:00
Simon L
c0e22efdbc Merge pull request #1670 from nextcloud/enh/1537/repair-integrity
allow to repair the integrity of the backup archive
2023-01-04 16:21:45 +01:00
Simon L
bc7b3c4c54 add onclick warning
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-04 16:17:04 +01:00
Simon L
6b91fb7ca2 allow to repair the integrity of the backup archive
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-04 16:17:04 +01:00
Simon L
f46f86dde6 Merge pull request #1667 from nextcloud/aio-yaml-update
Yaml updates
2023-01-04 16:07:29 +01:00
Simon L
57b5ea53e8 Merge pull request #1671 from nextcloud/enh/1662/add-talk-ulimit
add ulimit for the talk container due to a bug in libwebsockets
2023-01-04 16:03:14 +01:00
Simon L
b189e7b773 add ulimit for the talk container due to a bug in libwebsockets
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-04 16:01:33 +01:00
Simon L
480b3193d4 add a debug advice for collabora and talk
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-04 14:47:56 +01:00
Simon L
86c84de68b Merge pull request #1658 from nextcloud/enh/noid/add-totp-back
add twofactor_totp back as default enabled app
2023-01-04 14:17:09 +01:00
szaimen
c9e2b183aa Yaml updates
Signed-off-by: GitHub <noreply@github.com>
2023-01-04 12:16:14 +00:00
Simon L
39a46428c2 Merge pull request #1639 from nextcloud/aio-yaml-update
Yaml updates
2023-01-04 12:50:05 +01:00
Simon L
e047c2402b Merge pull request #1663 from nextcloud/enh/1643/set-remote-font-config-for-collabora
set remote_font_config for collabora
2023-01-04 12:32:35 +01:00
Simon L
17031c7b7f Merge pull request #1659 from nextcloud/enh/noid/devices
allow to add the /dev/dri device into the container and refactor devices
2023-01-04 12:31:13 +01:00
Simon L
34376d535f set remote_font_config for collabora
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-04 12:28:56 +01:00
Simon L
a0bbb86b13 add twofactor_totp back as default enabled app
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-03 14:42:57 +01:00
szaimen
ec0e5b645d Yaml updates
Signed-off-by: GitHub <noreply@github.com>
2023-01-03 12:15:50 +00:00
Simon L
dc74c2f94f Merge pull request #1660 from nextcloud/automated/noid/psalm-baseline-update-1672719685
[Automated] Update psalm-baseline.xml
2023-01-03 09:06:53 +01:00
nextcloud-command
5fd210f9d8 Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2023-01-03 04:21:25 +00:00
Simon L
92b271c3e5 allow to add the /dev/dri device into the container and refactor devices
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-03 02:13:34 +01:00
Simon L
7237433548 add some documentation for the apps-disable on startup feature
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-02 23:58:25 +01:00
Simon L
32245612b9 Merge pull request #1646 from nextcloud/dependabot/docker/Containers/imaginary/nextcloud/imaginary-20230101
Bump nextcloud/imaginary from 20221201 to 20230101 in /Containers/imaginary
2023-01-02 22:41:57 +01:00
Simon L
316fd3460c Merge pull request #1654 from nextcloud/enh/noid/allow-enable-apps
allow to enable shipped apps during startup
2023-01-02 22:38:18 +01:00
Simon L
03d761b240 allow to enable shipped apps during startup
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-02 22:33:03 +01:00
Simon L
cf27112c04 Merge pull request #1604 from nextcloud/enh/noid/improve-containers-schema
improve containeers schema
2023-01-02 22:19:09 +01:00
Simon L
de1eaf7707 add isset for non-required properties
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-02 22:14:36 +01:00
Simon L
f98528eac5 rename services to aio_services_v1
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-02 22:11:20 +01:00
Simon L
29197deb69 removed not-used properties from the containers definition
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-02 22:11:20 +01:00
Simon L
57e1d95643 improve containeers schema
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-02 22:11:20 +01:00
Simon L
0ef29ffb0c Merge pull request #1657 from nextcloud/enh/noid/fix-healtchecks
fix healthcheck for nextcloud and database
2023-01-02 21:50:38 +01:00
Simon L
ed5483500a Address review
Signed-off-by: Simon L <szaimen@e.mail.de>
Co-Authored-By: Zoey <zoey@z0ey.de>
2023-01-02 21:48:55 +01:00
Simon L
54c642e787 fix healthcheck for nextcloud and database
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-02 18:16:12 +01:00
Simon L
cd06678191 Merge pull request #1655 from nextcloud/enh/noid/fix-adding-containers-to-host-network
fix adding containers to the host network
2023-01-02 17:56:50 +01:00
Simon L
454269ec5b Merge pull request #1656 from nextcloud/enh/noid/fix-exposing-containers
fix exposing containers
2023-01-02 17:55:32 +01:00
Simon L
cb980f9e84 fix exposing containers
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-02 17:53:52 +01:00
Simon L
3e8cdf16b1 Merge pull request #1645 from nextcloud/enh/noid/add-types
add types for missing ones and bring psalm-baseline down to zero
2023-01-02 17:39:00 +01:00
Simon L
5f63e90922 fix adding containers to the host network
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-02 16:42:08 +01:00
Simon L
f272979c43 address review by making $args an array
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-02 15:46:58 +01:00
Simon L
8089ab83cf add types for missing ones
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-01-02 13:17:41 +01:00
dependabot[bot]
5bd7070593 Bump nextcloud/imaginary in /Containers/imaginary
Bumps nextcloud/imaginary from 20221201 to 20230101.

---
updated-dependencies:
- dependency-name: nextcloud/imaginary
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-02 12:10:49 +00:00
Simon L
eaabc8e4b0 Merge pull request #1635 from nextcloud/enh/noid/refactor-container-ports
refactor containerports
2022-12-30 23:15:35 +01:00
Simon L
210252825a also fix the update-yaml script
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-30 23:11:02 +01:00
Simon L
5dc9fad2d6 refactor containerports
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-30 23:10:44 +01:00
Simon L
1194b7a1ff Merge pull request #1637 from nextcloud/enh/noid/refactor-volumes
rename volume name to source and volume location to destination
2022-12-30 23:08:59 +01:00
Simon L
6dd9412fb6 rename volume name to source and volume location to destination
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-30 22:56:37 +01:00
Simon L
e535abccc7 Merge pull request #1597 from nextcloud/enh/noid/allow-to-add-host-network
allow to add container to host network
2022-12-30 21:14:25 +01:00
Simon L
cea32f50af allow to add container to host network
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-30 21:08:52 +01:00
Simon L
9c968d33b9 Merge pull request #1596 from nextcloud/enh/noid/pre-generate-secrets
secrets should only get generated if defined in secrets of container.…
2022-12-30 20:51:21 +01:00
Simon L
209d2e0f9a Merge pull request #1631 from nextcloud/automated/noid/psalm-baseline-update-1672374034
[Automated] Update psalm-baseline.xml
2022-12-30 10:49:43 +01:00
nextcloud-command
10cdcaa98f Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2022-12-30 04:20:33 +00:00
Simon L
c21087d6d0 Merge pull request #1619 from nextcloud/change-healthchecks
change dockerfile links, add tzdata to fulltext, migrate healthchecks to nc
2022-12-29 16:40:28 +01:00
Zoey
88fda477c6 change dockerfile links, add tzdata to fulltext, migrate healthchecks to nc
Signed-off-by: Zoey <zoey@z0ey.de>
2022-12-29 16:38:59 +01:00
Simon L
75bea8fa1f Merge pull request #1615 from nextcloud/enh/1611/improve-healtcheck
improve healthcheck to only exit 1 if it is started
2022-12-29 16:36:22 +01:00
Simon L
91fc8e6f97 Merge pull request #1587 from nextcloud/enh/noid/update-mastercontainer-to-8.1
update mastercontainer to php 8.1
2022-12-29 14:09:12 +01:00
Simon L
03d8a7d4fe Merge pull request #1612 from nextcloud/aio-dependency-update
Dependency updates
2022-12-29 14:06:30 +01:00
Simon L
1813fc3793 Merge pull request #1622 from nextcloud/enh/1564/add-additional-output
borg - add progress back and add some additional output
2022-12-29 13:59:27 +01:00
Simon L
6cceeda738 fix the last command
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-29 13:56:36 +01:00
Simon L
e8974323aa Merge pull request #1620 from nextcloud/enh/1553/add-migration-import-docs
migration - add some documentation on limits regarding the database owner name
2022-12-29 13:51:07 +01:00
Simon L
e4214c2f1e Merge pull request #1621 from nextcloud/enh/noid/improve-database-initialization
allow to make wrong database intialization better debuggable
2022-12-29 13:50:24 +01:00
Simon L
d06b3a7b19 revert imagemagick6 change
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-29 13:43:47 +01:00
Simon L
7a6f350248 try imagemagick6
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-29 13:26:30 +01:00
szaimen
4621a74bb0 dependency updates
Signed-off-by: GitHub <noreply@github.com>
2022-12-29 12:15:09 +00:00
Simon L
6f5b2cc94e Merge pull request #1627 from nextcloud/enh/noid/improve-imagick
move imagick back to the dockerfile
2022-12-29 13:07:40 +01:00
Simon L
e32a3e8d0c move imagick back to the dockerfile
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-29 13:05:54 +01:00
Simon L
810094daa3 try to make imagick work
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-29 12:31:59 +01:00
Simon L
a2cfa17b05 Merge pull request #1626 from nextcloud/enh/noid/addmore-formats
add other file types as well
2022-12-29 11:42:17 +01:00
Simon L
4d83172a91 add other file types as well
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-29 11:37:02 +01:00
Simon L
9a9f16ec2f Merge pull request #1625 from nextcloud/revert-1603-enh/noid/refactor-volumes
Revert "substitute volume variables in dockeractionmanager"
2022-12-29 11:31:12 +01:00
Simon L
1f2e23c447 Revert "substitute volume variables in dockeractionmanager"
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-29 11:30:14 +01:00
Simon L
44fb8368bf also add libheif-dev
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-29 11:25:33 +01:00
Simon L
6fdc539ff4 Merge pull request #1624 from nextcloud/fix/noid/avatar-generation
add freetype-dev and fontconfig-dev for compiliing imagick
2022-12-29 11:15:18 +01:00
Simon L
b684e8d1e1 add freetype-dev and fontconfig-dev for compiliing imagick
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-29 11:11:08 +01:00
Simon L
417c6771c8 Merge pull request #1603 from nextcloud/enh/noid/refactor-volumes
substitute volume variables in dockeractionmanager
2022-12-29 10:33:57 +01:00
Simon L
13ca2a35a8 Merge pull request #1598 from nextcloud/enh/noid/allwo-to-hide-containers
allow to hide containers from the interface via display_name
2022-12-29 10:30:05 +01:00
Simon L
2983904697 Merge pull request #1595 from nextcloud/enh/noid/improve-container-definition
rename values of containers definition to match docker-compose values
2022-12-29 10:27:05 +01:00
Simon L
d0ab26918f Merge pull request #1527 from nextcloud/aio-yaml-update
Yaml updates
2022-12-29 10:14:25 +01:00
Simon L
f06ce34472 borg - add progress back and add some additional output
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-29 10:06:50 +01:00
szaimen
af128d1b46 Yaml updates
Signed-off-by: GitHub <noreply@github.com>
2022-12-28 23:50:41 +00:00
Simon L
35f2d7db16 fix the clamav_enabled description
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-29 00:49:44 +01:00
Simon L
ee50e9147d allow to make wrong database intialization better debuggable
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-29 00:41:29 +01:00
Simon L
8ae4ec52a3 migration - add some documentation on limits regarding the database owner name
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-29 00:29:53 +01:00
Simon L
fc29e69b96 improve healthcheck to only exit 1 if it is started
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-28 15:25:20 +01:00
Simon L
b5e40dbb94 substitute volume variables in dockeractionmanager
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-26 02:14:06 +01:00
Simon L
2fd750c8b2 allow to hide containers from the interface via display_name
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-25 15:56:37 +01:00
Simon L
117c3de7c5 add items type for secrets
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-25 02:45:32 +01:00
Simon L
27bd5ce1a4 secrets should only get generated if defined in secrets of container.json
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-25 02:28:53 +01:00
Simon L
54f61eba68 internal_ports should be a string and not an array
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-25 01:46:42 +01:00
Simon L
53065b5631 rename internalPorts to internal_ports
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-25 01:08:44 +01:00
Simon L
7a9a452f45 rename production to services
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-25 01:08:44 +01:00
Simon L
3c57b2db56 rename displayName to display_name
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-25 01:08:43 +01:00
Simon L
1e78d729c4 rename restartPolicy to restart
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-25 01:08:43 +01:00
Simon L
5c444472c7 rename maxShutdownTime to stop_grace_period
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-25 01:08:43 +01:00
Simon L
b13cb77ce2 rename environmentVariables to environment
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-25 01:08:43 +01:00
Simon L
4a69d53a67 rename containerName to image
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-25 01:08:43 +01:00
Simon L
6cca3ceb6c rename dependsOn to depends_on
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-25 01:08:43 +01:00
Simon L
7720ed5061 rename identifier to container_name
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-25 00:36:19 +01:00
ManOki
4750fb228f manual-install: add IMAGE_TAG to omit separate latest-arm64.yml (#1591)
* manual-install: add IMAGE_TAG to omit separate latest-arm64.yml

Signed-off-by: ManOki <ManOki@users.noreply.github.com>
Co-authored-by: Simon L. <szaimen@e.mail.de>
2022-12-24 10:55:49 +01:00
Simon L
34854ba461 Merge pull request #1580 from nextcloud/apache-reverse-proxy-docs
improve the apache reverse proxy documentation
2022-12-23 22:39:03 +01:00
Simon L
059015968c Merge pull request #1590 from ManOki/documentation
manual-install: update readme to use default docker environment file
2022-12-23 22:03:58 +01:00
Simon L
377058cef1 make description of the mv command a bit clearer
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-23 22:03:00 +01:00
Simon L
67aa36c687 Merge pull request #1586 from ManOki/main
manual-install: add docker profiles for optional services
2022-12-23 21:59:15 +01:00
Simon L
653c63565e remove spaces in empty lines
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-23 21:57:25 +01:00
Simon L
a81be7c35c update script to add the profiles option automatically
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-23 21:40:15 +01:00
ManOki
7dc4edc1e0 manual-install: update readme to use default docker environment file .env
Signed-off-by: ManOki <ManOki@users.noreply.github.com>
2022-12-23 20:19:29 +01:00
szaimen
fbe8316e1d dependency updates
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-23 17:19:38 +01:00
Simon L
950ab32d26 update mastercontainerto php 8.1
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-23 17:02:47 +01:00
ManOki
ce165e05a1 manual-install: add docker profiles for optional services
Signed-off-by: ManOki <ManOki@users.noreply.github.com>
2022-12-23 16:53:20 +01:00
Zoey
14e095b569 try to close #1314
Got it from: https://stackoverflow.com/a/41388585 & https://httpd.apache.org/docs/2.4/mod/mod_rewrite.html
In my test, it works

Signed-off-by: Zoey <zoey@z0ey.de>
2022-12-23 15:33:15 +01:00
Simon L
3eb2b164e1 Merge pull request #1579 from nextcloud/revert-1572-enh/noid/add-files_lock-app
Revert "the files_lock app should get installed by default as well"
2022-12-22 18:47:12 +01:00
Simon L
ed62ff1ff5 Revert "the files_lock app should get installed by default as well"
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-22 18:45:44 +01:00
Simon L
d6208a0b18 fix the comment
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-22 10:16:47 +01:00
Simon L
e8e01f8687 increase to 4.0.1
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-22 09:44:23 +01:00
Simon L
f2cd2b9fbd Merge pull request #1572 from nextcloud/enh/noid/add-files_lock-app
the files_lock app should get installed by default as well
2022-12-22 09:43:43 +01:00
Simon L
2ddd9406aa the files_lock app should get installed by default as well
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-22 01:02:08 +01:00
Simon L
35b87eee9b typo
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-22 00:14:19 +01:00
Simon L
1a7dbb4dab fix small detail
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-22 00:12:50 +01:00
Simon L
73e029ec23 improve the reverse proxy documentation further
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-22 00:08:53 +01:00
Simon L
d8f78e186c Merge pull request #1499 from nextcloud/enh/noid/fix-collabora
make collabora more safe
2022-12-21 23:31:34 +01:00
Simon L
be6bcfe997 Merge pull request #1557 from nextcloud/enh/1553/improve-import
improve database import
2022-12-21 23:29:16 +01:00
Simon L
502b39a354 Merge pull request #1566 from nextcloud/enh/noid/turn-server
make the turnserver more reliable
2022-12-21 23:29:00 +01:00
Simon L
ffd970352e Merge pull request #1558 from nextcloud/enh/1547/fix-turn-add-syntax
fix the turn:add syntax
2022-12-21 23:28:49 +01:00
Simon L
ce54d6d70d Merge pull request #1569 from nextcloud/enh/noid/add-gcompat
add gcompat for the recognize app
2022-12-21 23:21:36 +01:00
Simon L
5f68d55672 update OO
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-21 23:19:19 +01:00
Simon L
afb3734000 Merge pull request #1559 from nextcloud/dependabot/docker/Containers/collabora/collabora/code-22.05.9.2.1
Bump collabora/code from 22.05.8.4.1 to 22.05.9.2.1 in /Containers/collabora
2022-12-21 23:18:24 +01:00
Simon L
48795c3911 Merge pull request #1568 from nextcloud/dependabot/docker/Containers/apache/debian-bullseye-20221219-slim
Bump debian from bullseye-20221205-slim to bullseye-20221219-slim in /Containers/apache
2022-12-21 23:16:59 +01:00
Simon L
c0bf69f5dd Merge pull request #1567 from nextcloud/dependabot/docker/Containers/borgbackup/debian-bullseye-20221219-slim
Bump debian from bullseye-20221205-slim to bullseye-20221219-slim in /Containers/borgbackup
2022-12-21 23:16:33 +01:00
Simon L
9184aab3ec add gcompat for the recognize app
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-21 16:10:15 +01:00
dependabot[bot]
f4f717c929 Bump debian in /Containers/apache
Bumps debian from bullseye-20221205-slim to bullseye-20221219-slim.

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-21 12:10:40 +00:00
dependabot[bot]
a12b1c0e56 Bump debian in /Containers/borgbackup
Bumps debian from bullseye-20221205-slim to bullseye-20221219-slim.

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-21 12:10:04 +00:00
Simon L
0239788c78 make the turnserver more reliable
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-21 11:36:32 +01:00
Simon L
70a03ba1ae add facerecognition notice to the readme
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-20 23:54:30 +01:00
Simon L
edb616b18c add logging to database import
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-20 17:07:43 +01:00
dependabot[bot]
730d4e1bee Bump collabora/code in /Containers/collabora
Bumps collabora/code from 22.05.8.4.1 to 22.05.9.2.1.

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-20 12:06:41 +00:00
Simon L
e70bc8c5f7 fix the turn:add syntax
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-20 11:16:50 +01:00
Simon L
e47b58312a improve database import
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-20 10:59:01 +01:00
Simon L
aea0cf7382 Merge pull request #1556 from nextcloud/automated/noid/psalm-baseline-update-1671510103
[Automated] Update psalm-baseline.xml
2022-12-20 09:51:15 +01:00
nextcloud-command
01ea8900cc Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2022-12-20 04:21:42 +00:00
Simon L
14c90cdd9e Merge pull request #1544 from thigg/patch-1
Added cifs/smb config help to readme
2022-12-19 14:20:03 +01:00
Simon L
f3bfc2beb7 a few improvements
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-19 14:18:03 +01:00
Simon L
c5749defc8 Merge pull request #1548 from nextcloud/automated/noid/psalm-baseline-update-1671423723
[Automated] Update psalm-baseline.xml
2022-12-19 10:59:27 +01:00
nextcloud-command
42c7e86ee9 Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2022-12-19 04:22:03 +00:00
thigg
6a509513a3 Added cifs/smb config help to readme
Signed-off-by: thigg <thigg@users.noreply.github.com>
2022-12-18 18:17:43 +01:00
Simon L
65b6d7e6b1 make more clear which FS is recommended for docker
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-18 15:02:26 +01:00
Simon L
756511f16a This does not work
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-17 16:46:24 +01:00
Simon L
4ab3520d10 another one
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-17 16:38:58 +01:00
Simon L
de01850279 another attempt
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-17 16:20:58 +01:00
Simon L
70b87ed9f8 try to fix it
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-17 16:14:11 +01:00
Simon L
e389a17a74 try to fix the elasticsearch inclusion
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-17 16:03:03 +01:00
Simon L
331442fe38 add two more points to manual-install
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-17 15:43:34 +01:00
Simon L
1208000234 Merge pull request #1541 from nextcloud/enh/1538/clamd-timeout
change clamd startup timeout to 90s
2022-12-17 15:36:43 +01:00
Simon L
083150bfb3 Merge pull request #1540 from nextcloud/enh/noid/revert-clamav-trap
Revert "fix Clamav starting trap"
2022-12-17 15:34:23 +01:00
Simon L
f4944fbf92 change clamd startup timeout to 90s
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-17 15:33:28 +01:00
Simon L
3f775653a0 Revert "fix Clamav starting trap"
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-17 15:30:45 +01:00
Simon L
c16d59f9e4 Merge pull request #1532 from nextcloud/enh/1531/add-stdbuf
add stdbuf
2022-12-17 15:28:56 +01:00
Simon L
605f8c87fb Merge pull request #1539 from nextcloud/enh/noid/reload-always
reload in case of undefined response
2022-12-17 15:27:45 +01:00
Simon L
1dee9c465c reload in case of undefined response
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-17 15:26:51 +01:00
Simon L
ec1f5aa129 Merge pull request #1506 from nextcloud/enh/noid/disable-borg-compact
make more clear what to do when borg check fails
2022-12-16 20:06:58 +01:00
Simon L
17fe0db050 Merge pull request #1534 from nextcloud/enh/noid/fix-clamav-daemon-starting-trap
fix Clamav starting trap
2022-12-16 18:53:14 +01:00
Simon L
3c40abbb60 make more clear what to do when borg check fails
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-16 18:46:08 +01:00
Simon L
163f6ea10a Merge pull request #1533 from nextcloud/enh/noid/dont-start-nextcloud-if-install-failed
Don't start the Nextcloud container if the installation failed
2022-12-16 18:12:41 +01:00
Simon L
1bd3c2cb4c add a further hint
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-16 18:12:03 +01:00
Simon L
b90226282a add stdbuf
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-16 17:53:38 +01:00
Simon L
08aa2eece3 fix Clamav starting trap
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-16 12:36:51 +01:00
Simon L
e18f8308ed Don't start the Nextcloud container if the installation failed
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-16 10:57:42 +01:00
Simon L
0b961c9dfc try - catch is not needed for onlyoffice js
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-16 10:36:13 +01:00
Simon L
9b3ad32764 fix restoring of elasticsearch volume
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-15 15:09:39 +01:00
Simon L
fb6668755c make rsync less verbose
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-15 14:32:03 +01:00
Simon L
71231b9b8b increase to 4.0.0
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-15 12:20:04 +01:00
Simon L
e53281610d Merge pull request #1495 from nextcloud/enh/1280/nc25
update to Nextcloud 25
2022-12-15 12:17:47 +01:00
Simon L
3568adf8c6 Merge pull request #1498 from nextcloud/enh/1032/add-collabora-volume
add a volume for collabora fonts
2022-12-15 12:14:29 +01:00
Simon L
b1d5204078 Merge pull request #1497 from nextcloud/enh/1156/add-redis-volume
add a volume for redis
2022-12-15 12:13:11 +01:00
Simon L
79946a876c remove the redis database once a backup gets restored
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-15 12:10:55 +01:00
Simon L
882fd3be26 add a volume for redis
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-15 12:09:31 +01:00
Simon L
7eb59374a2 Merge pull request #1496 from nextcloud/enh/1191/remove-mysql
remove pdo_mysql
2022-12-15 12:08:56 +01:00
Simon L
28919e27f3 Merge pull request #1513 from nextcloud/enh/noid/back-up-fts-volume
also back up the fulltextsearch volume
2022-12-15 12:08:48 +01:00
Simon L
098a6c4b29 Merge pull request #1432 from nextcloud/enh/1280/remove-appporder
remove the apporder and twofactor_totp app
2022-12-15 12:08:37 +01:00
Simon L
d20cf5777f remove the twofactor_totp app since it is bundled now
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-15 12:06:57 +01:00
Simon L
6b3be9d6e8 remove the apporder app
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-15 12:06:27 +01:00
Simon L
03e2ffb3c9 Merge pull request #1520 from nextcloud/dependabot/docker/Containers/redis/redis-6.2.8-alpine
Bump redis from 6.2.7-alpine to 6.2.8-alpine in /Containers/redis
2022-12-15 11:14:46 +01:00
Simon L
1e3dccf976 Merge pull request #1516 from nextcloud/enh/noid/fix-spaces
fix spaces in env file
2022-12-15 11:14:08 +01:00
Simon L
84a5e28784 Merge pull request #1515 from nextcloud/enh/noid/remove-container-name
manual-install - remove container_name so that it should run using do…
2022-12-15 11:13:40 +01:00
Simon L
4de666eba4 Merge pull request #1514 from nextcloud/enh/noid/sync-autoconfig
also sync autoconfig files
2022-12-15 11:13:08 +01:00
Simon L
e061a16cb7 Merge pull request #1512 from nextcloud/dependabot/docker/Containers/fulltextsearch/elasticsearch-7.17.8
Bump elasticsearch from 7.17.7 to 7.17.8 in /Containers/fulltextsearch
2022-12-15 11:11:40 +01:00
Simon L
f5e36c854e Merge pull request #1500 from nextcloud/dependabot/docker/Containers/talk/ubuntu-focal-20221130
Bump ubuntu from focal-20221019 to focal-20221130 in /Containers/talk
2022-12-15 11:11:20 +01:00
Simon L
ab384f6e29 Merge pull request #1521 from nextcloud/dependabot/github_actions/cirrus-actions/rebase-1.8
Bump cirrus-actions/rebase from 1.7 to 1.8
2022-12-14 13:10:57 +01:00
dependabot[bot]
e5ca49356c Bump cirrus-actions/rebase from 1.7 to 1.8
Bumps [cirrus-actions/rebase](https://github.com/cirrus-actions/rebase) from 1.7 to 1.8.
- [Release notes](https://github.com/cirrus-actions/rebase/releases)
- [Commits](https://github.com/cirrus-actions/rebase/compare/1.7...1.8)

---
updated-dependencies:
- dependency-name: cirrus-actions/rebase
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-14 12:06:35 +00:00
Simon L
bd81c3133f also sync autoconfig files
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-13 23:45:01 +01:00
Simon L
c6e45ef378 add exception for elasticsearch and re-order the exceptions
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-13 15:06:47 +01:00
Simon L
52b8bf0696 make collabora more safe
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-13 14:52:01 +01:00
Simon L
bea8ca86dd add a volume for collabora fonts
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-13 14:42:02 +01:00
Simon L
ab5369023b update to Nextcloud 25
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-13 14:11:11 +01:00
dependabot[bot]
f9290e49c8 Bump redis from 6.2.7-alpine to 6.2.8-alpine in /Containers/redis
Bumps redis from 6.2.7-alpine to 6.2.8-alpine.

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-13 12:04:55 +00:00
Simon L
becfb3cc16 Merge pull request #1517 from nextcloud/automated/noid/psalm-baseline-update-1670905372
[Automated] Update psalm-baseline.xml
2022-12-13 09:14:46 +01:00
nextcloud-command
7cf9fe8dec Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2022-12-13 04:22:52 +00:00
Simon L
aa32d496e6 Update sample.conf
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-13 00:48:08 +01:00
Simon L
d9f994fc5d fix spaces in env file
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-13 00:45:48 +01:00
Simon L
df9457bd91 manual-install - remove container_name so that it should run using docker-swarm too
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-13 00:33:57 +01:00
Simon L
85999c297c also back up the fulltextsearch volume
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-12 18:16:24 +01:00
dependabot[bot]
af1612cda1 Bump elasticsearch from 7.17.7 to 7.17.8 in /Containers/fulltextsearch
Bumps elasticsearch from 7.17.7 to 7.17.8.

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-12 12:14:04 +00:00
dependabot[bot]
211ce3c69b Bump ubuntu from focal-20221019 to focal-20221130 in /Containers/talk
Bumps ubuntu from focal-20221019 to focal-20221130.

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-09 12:06:33 +00:00
Simon L
7b4d0baa6c remove pdo_mysql
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-09 11:33:46 +01:00
135 changed files with 4299 additions and 1852 deletions

View File

@@ -4,12 +4,10 @@ about: Help us improving by reporting a bug
labels: bug, 0. Needs triage
---
<!--- Please keep this note for other contributors -->
### How to use GitHub
* Please use the 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to show that you are affected by the same issue.
* Please don't comment if you have no relevant information to add. It's just extra noise for everyone subscribed to this issue.
* Subscribe to receive notifications on status change and new comments.
<!---
- If you use Cloudflare Tunnel or Cloudflare Proxy, see https://github.com/nextcloud/all-in-one#notes-on-cloudflare-proxytunnel for known issues/limitations and workarounds.
- For issues with Collabora or Talk, make sure to follow https://github.com/nextcloud/all-in-one/discussions/1358. It may already resolve your issue and makes it easier to help you.
--->
<!--- Please fill out the whole template below -->
### Steps to reproduce

View File

@@ -4,12 +4,6 @@ about: Suggest an enhancement of an existing feature/documentation - for other t
labels: enhancement, 0. Needs triage
---
<!--- Please keep this note for other contributors -->
### How to use GitHub
* Please use the 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to show that you are interested into the same feature.
* Please don't comment if you have no relevant information to add. It's just extra noise for everyone subscribed to this issue.
* Subscribe to receive notifications on status change and new comments.
<!--- Please fill out the whole template below -->
### Is your feature request related to a problem? Please describe.
<!--- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->

View File

@@ -23,7 +23,7 @@ jobs:
steps:
- name: Add reaction on start
uses: peter-evans/create-or-update-comment@v2
uses: peter-evans/create-or-update-comment@v3
with:
token: ${{ secrets.COMMAND_BOT_PAT }}
repository: ${{ github.event.repository.full_name }}
@@ -37,12 +37,12 @@ jobs:
token: ${{ secrets.COMMAND_BOT_PAT }}
- name: Automatic Rebase
uses: cirrus-actions/rebase@1.7
uses: cirrus-actions/rebase@1.8
env:
GITHUB_TOKEN: ${{ secrets.COMMAND_BOT_PAT }}
- name: Add reaction on failure
uses: peter-evans/create-or-update-comment@v2
uses: peter-evans/create-or-update-comment@v3
if: failure()
with:
token: ${{ secrets.COMMAND_BOT_PAT }}

View File

@@ -23,7 +23,7 @@ jobs:
- name: Modify the Dockerfile
run: |
set -x
sed -i 's|FROM php:7.4-alpine|FROM php:8.0-alpine|' "psalm-github-actions/Dockerfile"
sed -i 's|FROM php:7.4-alpine|FROM php:8.2-alpine|' "psalm-github-actions/Dockerfile"
cat << APCU >> "psalm-github-actions/Dockerfile"
RUN mkdir -p /usr/src/php/ext/apcu && \
curl -fsSL https://pecl.php.net/get/apcu | tar xvz -C "/usr/src/php/ext/apcu" --strip 1 && \
@@ -45,7 +45,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build container image
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
push: true
context: 'psalm-github-actions'

View File

@@ -11,28 +11,26 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: nanasess/setup-php@master
- uses: shivammathur/setup-php@v2
with:
php-version: 8.0
php-version: 8.2
extensions: apcu
- name: Run dependency update script
run: |
set -x
curl -sS https://getcomposer.org/installer | php
mv composer.phar /usr/local/bin/composer
chmod +x /usr/local/bin/composer
cd ./php
composer update
set +e
ALL_LINES="$(composer outdated | grep -v "psr/container\|^$\|Direct dependencies\|Everything up to date\|Transitive dependencies")"
set -e
while [ -n "$ALL_LINES" ]; do
CURRENT_LINE="$(echo "$ALL_LINES" | head -1)"
composer require "$(echo "$CURRENT_LINE" | awk '{print $1}')" "^$(echo "$CURRENT_LINE" | awk '{print $4}')"
ALL_LINES="$(echo "$ALL_LINES" | sed '1d')"
done
echo "outdated dependencies:
$(composer outdated)"
composer update --with-all-dependencies
# Disable dependency updates for now
# set +e
# ALL_LINES="$(composer outdated | grep -v "^$\|Direct dependencies\|Everything up to date\|Transitive dependencies")"
# set -e
# while [ -n "$ALL_LINES" ]; do
# CURRENT_LINE="$(echo "$ALL_LINES" | head -1)"
# composer require "$(echo "$CURRENT_LINE" | awk '{print $1}')" "^$(echo "$CURRENT_LINE" | awk '{print $4}')" --with-all-dependencies
# ALL_LINES="$(echo "$ALL_LINES" | sed '1d')"
# done
# echo "outdated dependencies:
# $(composer outdated)"
- name: Update apcu
run: |
# APCU
@@ -46,12 +44,12 @@ jobs:
)"
sed -i "s|pecl install APCu.*\;|pecl install APCu-$apcu_version\;|" ./Containers/mastercontainer/Dockerfile
- name: Create Pull Request
uses: peter-evans/create-pull-request@v4
uses: peter-evans/create-pull-request@v5
with:
commit-message: dependency updates
signoff: true
title: Dependency updates
body: Automated dependency updates since dependabot does not support grouped updates
labels: dependencies, enhancement
labels: dependencies, 3. to review
milestone: next
branch: aio-dependency-update

48
.github/workflows/helm-release.yml vendored Normal file
View File

@@ -0,0 +1,48 @@
name: Helm Chart Releaser
on:
push:
branches:
- main
paths:
- 'nextcloud-aio-helm-chart/**'
jobs:
release:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Turnstyle
uses: softprops/turnstyle@v1
with:
continue-after-seconds: 180
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Fetch history
run: git fetch --prune --unshallow
- name: Configure Git
run: |
git config user.name "$GITHUB_ACTOR"
git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
# See https://github.com/helm/chart-releaser-action/issues/6
- name: Set up Helm
uses: azure/setup-helm@v3.1
with:
version: v3.6.3
- name: Run chart-releaser
# TODO: switch back @main to a specific version like @v1.5.1 or higher
uses: helm/chart-releaser-action@main
with:
mark_as_latest: false
charts_dir: .
env:
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
CR_RELEASE_NAME_TEMPLATE: "helm-chart-{{ .Version }}"
CR_SKIP_EXISTING: true

33
.github/workflows/imaginary-update.yml vendored Normal file
View File

@@ -0,0 +1,33 @@
name: imaginary-update
on:
workflow_dispatch:
schedule:
- cron: '00 12 * * *'
jobs:
run_update:
name: update to latest imaginary commit on master branch
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Run imaginary-update
run: |
# Imaginary
imaginary_version="$(
git ls-remote https://github.com/h2non/imaginary master \
| cut -f1 \
| tail -1
)"
sed -i "s|go install github.com/h2non/imaginary.*;|go install github.com/h2non/imaginary@$imaginary_version;|" ./Containers/imaginary/Dockerfile
- name: Create Pull Request
uses: peter-evans/create-pull-request@v5
with:
commit-message: imaginary-update automated change
signoff: true
title: Imaginary update
body: Automated Imaginary container update
labels: dependencies, 3. to review
milestone: next
branch: imaginary-container-update

View File

@@ -15,6 +15,6 @@ jobs:
uses: actions/checkout@v3
- name: Validate Json
run: |
sudo apt install python3-pip --no-install-recommends
sudo apt-get install python3-pip --no-install-recommends
sudo pip3 install json-spec
json validate --schema-file=php/containers-schema.json --document-file=php/containers.json

View File

@@ -3,7 +3,7 @@
# https://github.com/nextcloud/.github
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
name: Lint
name: PHP Lint
on:
pull_request:
@@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: ["8.0"]
php-versions: ["8.2"]
name: php-lint

View File

@@ -58,7 +58,7 @@ jobs:
| sort -V \
| tail -1
)"
sed -i "s|pecl install imagick.*|pecl install imagick-$imagick_version >/dev/null|" ./Containers/nextcloud/start.sh
sed -i "s|pecl install imagick.*\;|pecl install imagick-$imagick_version\;|" ./Containers/nextcloud/Dockerfile
# Nextcloud
NC_MAJOR="$(grep "ENV NEXTCLOUD_VERSION" ./Containers/nextcloud/Dockerfile | grep -oP '[23][0-9]')"
@@ -66,12 +66,12 @@ jobs:
sed -i "s|^ENV NEXTCLOUD_VERSION.*|ENV NEXTCLOUD_VERSION $NCVERSION|" ./Containers/nextcloud/Dockerfile
- name: Create Pull Request
uses: peter-evans/create-pull-request@v4
uses: peter-evans/create-pull-request@v5
with:
commit-message: nextcloud-update automated change
signoff: true
title: Nextcloud update
body: Automated Nextcloud container update
labels: dependencies, enhancement
labels: dependencies, 3. to review
milestone: next
branch: nextcloud-container-update

View File

@@ -13,10 +13,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up php8.0
- name: Set up php8.2
uses: shivammathur/setup-php@v2
with:
php-version: 8.0
php-version: 8.2
extensions: apcu
coverage: none
@@ -26,4 +26,7 @@ jobs:
cd php
composer global require wapmorgan/php-deprecation-detector dev-master
composer install
composer run php-deprecation-detector
composer run php-deprecation-detector | tee -i ./phpdd.log
if grep "Total issues:" ./phpdd.log; then
exit 1
fi

View File

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

View File

@@ -12,10 +12,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up php8.0
- name: Set up php8.2
uses: shivammathur/setup-php@v2
with:
php-version: 8.0
php-version: 8.2
extensions: apcu
coverage: none
@@ -31,7 +31,7 @@ jobs:
continue-on-error: true
- name: Create Pull Request
uses: peter-evans/create-pull-request@v4
uses: peter-evans/create-pull-request@v5
with:
token: ${{ secrets.COMMAND_BOT_PAT }}
commit-message: Update psalm baseline
@@ -42,7 +42,8 @@ jobs:
# Make sure we can open multiple PRs
branch-suffix: timestamp
title: '[Automated] Update psalm-baseline.xml'
milestone: next
body: |
Auto-generated update psalm-baseline.xml with fixed psalm warnings
labels: |
3. to review
3. to review, dependencies

View File

@@ -13,7 +13,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Run Shellcheck
uses: ludeeus/action-shellcheck@master
uses: ludeeus/action-shellcheck@2.0.0
with:
check_together: 'yes'
env:

55
.github/workflows/twig-lint.yml vendored Normal file
View File

@@ -0,0 +1,55 @@
name: Twig Lint
on:
pull_request:
push:
branches:
- main
permissions:
contents: read
concurrency:
group: lint-twig-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
jobs:
twig-lint:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: ["8.2"]
name: twig-lint
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Set up php ${{ matrix.php-versions }}
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
coverage: none
- name: twig lint
run: |
cd php
composer require sserbin/twig-linter:@dev --no-progress --dev
composer install
chmod +x ./vendor/bin/twig-linter
./vendor/bin/twig-linter lint ./templates
summary:
permissions:
contents: none
runs-on: ubuntu-latest
needs: twig-lint
if: always()
name: twig-lint-summary
steps:
- name: Summary status
run: if ${{ needs.twig-lint.result != 'success' && needs.twig-lint.result != 'skipped' }}; then exit 1; fi

33
.github/workflows/update-helm.yml vendored Normal file
View File

@@ -0,0 +1,33 @@
name: Update Helm Chart
on:
workflow_dispatch:
schedule:
- cron: '00 12 * * *'
jobs:
psalm:
name: update helm chart
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: update helm chart
run: |
DOCKER_TAG="$(curl -L -s 'https://registry.hub.docker.com/v2/repositories/nextcloud/all-in-one/tags?page_size=1024' | jq '."results"[]["name"]' | sed 's|"||g' | grep '^20' | sort -r | head -1)"
DOCKER_TAG="${DOCKER_TAG%%-latest*}"
export DOCKER_TAG
if [ -n "$DOCKER_TAG" ] && ! grep -q "$DOCKER_TAG" ./nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml; then
sudo bash nextcloud-aio-helm-chart/update-helm.sh "$DOCKER_TAG"
fi
- name: Create Pull Request
uses: peter-evans/create-pull-request@v5
with:
commit-message: Helm Chart updates
signoff: true
title: Helm Chart updates
body: Automated Helm Chart updates for the yaml files. It can be merged if it looks good at any time which will automatically trigger a new release of the helm chart.
labels: dependencies, 3. to review
milestone: next
branch: aio-helm-update
token: ${{ secrets.GITHUB_TOKEN }}

View File

@@ -16,12 +16,13 @@ jobs:
run: |
sudo bash manual-install/update-yaml.sh
- name: Create Pull Request
uses: peter-evans/create-pull-request@v4
uses: peter-evans/create-pull-request@v5
with:
commit-message: Yaml updates
signoff: true
title: Yaml updates
body: Automated yaml updates for the docker-compose files. Should only be merged shortly before the next latest release.
labels: dependencies
labels: dependencies, 3. to review
milestone: next
branch: aio-yaml-update
token: ${{ secrets.GITHUB_TOKEN }}

3
.gitignore vendored
View File

@@ -5,4 +5,5 @@
/php/vendor
/manual-install/*.conf
!/manual-install/sample.conf
/manual-install/docker-compose.yml
/manual-install/docker-compose.yml
/manual-install/.env

View File

@@ -4,41 +4,33 @@
storage file_system {
root /mnt/data/caddy
}
servers {
# trusted_proxies placeholder
}
log {
level ERROR
}
}
{$PROTOCOL}://{$NC_DOMAIN}:{$APACHE_PORT} {
# Collabora
route /browser/* {
reverse_proxy {$COLLABORA_HOST}:9980
}
route /hosting/* {
reverse_proxy {$COLLABORA_HOST}:9980
}
route /cool/* {
reverse_proxy {$COLLABORA_HOST}:9980
}
# Notify Push
route /push/* {
uri strip_prefix /push
reverse_proxy {$NEXTCLOUD_HOST}:7867 {
# trusted_proxies placeholder
}
}
# Talk
route /standalone-signaling/* {
uri strip_prefix /standalone-signaling
reverse_proxy {$TALK_HOST}:8081 {
# trusted_proxies placeholder
}
}
# Collabora
route /browser/* {
reverse_proxy {$COLLABORA_HOST}:9980 {
# trusted_proxies placeholder
}
}
route /hosting/* {
reverse_proxy {$COLLABORA_HOST}:9980 {
# trusted_proxies placeholder
}
}
route /cool/* {
reverse_proxy {$COLLABORA_HOST}:9980 {
# trusted_proxies placeholder
}
reverse_proxy {$NEXTCLOUD_HOST}:7867
}
# Onlyoffice
@@ -47,19 +39,24 @@
reverse_proxy {$ONLYOFFICE_HOST}:80 {
header_up X-Forwarded-Host {http.request.host}/onlyoffice
header_up X-Forwarded-Proto https
# trusted_proxies placeholder
}
}
# Talk
route /standalone-signaling/* {
uri strip_prefix /standalone-signaling
reverse_proxy {$TALK_HOST}:8081
}
# Others
import /mnt/data/caddy-imports/*
# Nextcloud
route {
rewrite /.well-known/carddav /remote.php/dav
rewrite /.well-known/caldav /remote.php/dav
header Strict-Transport-Security max-age=31536000;
reverse_proxy localhost:8000 {
# See https://github.com/nextcloud/all-in-one/issues/828
# trusted_proxies placeholder
}
reverse_proxy localhost:8000
}
# TLS options

View File

@@ -1,84 +1,74 @@
# Caddy is a requirement
FROM caddy:2.6.2-alpine as caddy
FROM caddy:2.6.4-alpine as caddy
FROM debian:bullseye-20221205-slim
FROM httpd:2.4.57-alpine3.17
RUN mkdir -p /mnt/data; \
chown www-data:www-data /mnt/data;
COPY --from=caddy /usr/bin/caddy /usr/bin/caddy
COPY --chown=33:33 Caddyfile /Caddyfile
COPY --chmod=664 nextcloud.conf /usr/local/apache2/conf/nextcloud.conf
COPY --chmod=664 supervisord.conf /supervisord.conf
COPY --chmod=775 start.sh /start.sh
COPY --chmod=775 healthcheck.sh /healthcheck.sh
VOLUME /mnt/data
RUN set -ex; \
apk add --no-cache shadow; \
groupmod -g 333 xfs; \
usermod -u 333 -g 333 xfs; \
groupmod -g 33 www-data; \
usermod -u 33 -g 33 www-data; \
apk del --no-cache shadow; \
\
apt-get update; \
apt-get install -y --no-install-recommends \
apache2 \
mkdir -p /mnt/data; \
chown -R www-data:www-data /mnt/data; \
\
apk add --no-cache \
bash \
supervisor \
wget \
tzdata \
ca-certificates \
openssl \
netcat \
dpkg-dev \
curl \
; \
rm -rf /var/lib/apt/lists/*
COPY --from=caddy /usr/bin/caddy /usr/bin/
RUN chmod +x /usr/bin/caddy
RUN a2enmod rewrite \
headers \
proxy \
proxy_fcgi \
setenvif \
env \
mime \
dir \
authz_core \
alias
COPY nextcloud.conf /etc/apache2/sites-available/
RUN rm /etc/apache2/ports.conf; \
sed -s -i -e "s/Include ports.conf//" /etc/apache2/apache2.conf; \
sed -i "/^Listen /d" /etc/apache2/apache2.conf
RUN set -ex; \
a2dissite 000-default && \
a2dissite default-ssl && \
rm -f /etc/apache2/sites-enabled/000-default.conf && \
rm -f /etc/apache2/sites-enabled/default-ssl.conf && \
rm /etc/apache2/sites-available/000-default.conf && \
rm /etc/apache2/sites-available/default-ssl.conf && \
a2ensite nextcloud.conf && \
rm -rf /var/www/html/* && \
chown www-data:www-data -R /var/log/apache2; \
mkdir -p /var/run/apache2; \
chown -R www-data:www-data /var/run/apache2; \
chown -R www-data:www-data /var/www;
RUN mkdir /var/log/supervisord; \
netcat-openbsd; \
\
sed -i \
-e '/^Listen /d' \
-e 's/^#\(LoadModule .*mod_rewrite.so\)/\1/' \
-e 's/^#\(LoadModule .*mod_headers.so\)/\1/' \
-e 's/^#\(LoadModule .*mod_proxy.so\)/\1/' \
-e 's/^#\(LoadModule .*mod_proxy_fcgi.so\)/\1/' \
-e 's/^#\(LoadModule .*mod_setenvif.so\)/\1/' \
-e 's/^#\(LoadModule .*mod_env.so\)/\1/' \
-e 's/^#\(LoadModule .*mod_mime.so\)/\1/' \
-e 's/^#\(LoadModule .*mod_dir.so\)/\1/' \
-e 's/^#\(LoadModule .*mod_authz_core.so\)/\1/' \
-e 's/^#\(LoadModule .*mod_alias.so\)/\1/' \
-e 's/^#\(LoadModule .*mod_mpm_event.so\)/\1/' \
-e 's/\(LoadModule .*mod_mpm_worker.so\)/#\1/' \
-e 's/\(LoadModule .*mod_mpm_prefork.so\)/#\1/' \
/usr/local/apache2/conf/httpd.conf; \
echo "Include conf/nextcloud.conf" | tee -a /usr/local/apache2/conf/httpd.conf; \
echo "ServerName localhost" | tee -a /usr/local/apache2/conf/httpd.conf; \
\
rm -rf /usr/local/apache2/conf/original /var/www; \
mkdir -p /var/www; \
chown -R www-data:www-data /var/www; \
\
mkdir /var/log/supervisord; \
mkdir /var/run/supervisord; \
chown www-data:www-data /var/run/supervisord; \
chown www-data:www-data /var/log/supervisord;
COPY Caddyfile /
COPY start.sh /usr/bin/
COPY healthcheck.sh /usr/bin/
COPY supervisord.conf /
RUN chmod +x /usr/bin/start.sh; \
chmod +x /usr/bin/healthcheck.sh; \
chmod +r /supervisord.conf; \
chown www-data:www-data /Caddyfile; \
chmod +r -R /etc/apache2
# Give root a random password
RUN echo "root:$(openssl rand -base64 12)" | chpasswd
chown www-data:www-data /var/log/supervisord; \
\
chown -R www-data:www-data /usr/local/apache2; \
chmod +r -R /usr/local/apache2; \
\
echo "root:$(openssl rand -base64 12)" | chpasswd
USER www-data
ENTRYPOINT ["start.sh"]
ENTRYPOINT ["/start.sh"]
CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]
HEALTHCHECK CMD healthcheck.sh
HEALTHCHECK CMD /healthcheck.sh
LABEL com.centurylinklabs.watchtower.monitor-only="true"

View File

@@ -1,8 +1,6 @@
#!/bin/bash
curl -skfI localhost:8000 || exit 1
if [ "$APACHE_PORT" != '443' ]; then
nc -z localhost "$APACHE_PORT" || exit 1
else
nc -z "$NC_DOMAIN" "$APACHE_PORT" || exit 1
fi
nc -z "$NEXTCLOUD_HOST" 9000 || exit 0
nc -z localhost 8000 || exit 1
nc -z localhost "$APACHE_PORT" || exit 1
nc -z "$NC_DOMAIN" 443 || exit 1

View File

@@ -39,16 +39,28 @@ echo "$CADDYFILE" > /Caddyfile
# Change the trusted_proxies in case of reverse proxies
if [ "$APACHE_PORT" != '443' ]; then
CADDYFILE="$(sed 's|# trusted_proxies placeholder|trusted_proxies private_ranges|' /Caddyfile)"
CADDYFILE="$(sed 's|# trusted_proxies placeholder|trusted_proxies static private_ranges|' /Caddyfile)"
else
CADDYFILE="$(sed 's|trusted_proxies private_ranges|# trusted_proxies placeholder|' /Caddyfile)"
CADDYFILE="$(sed 's|trusted_proxies.*private_ranges|# trusted_proxies placeholder|' /Caddyfile)"
fi
echo "$CADDYFILE" > /Caddyfile
# Fix the Caddyfile format
caddy fmt --overwrite /Caddyfile
# Add caddy path
mkdir -p /mnt/data/caddy/
# Fix apache sturtup
rm -f /var/run/apache2/apache2.pid
# Add caddy import path
mkdir -p /mnt/data/caddy-imports
exec "$@"
# Remove falsely added Nextcloud conf
rm -f /mnt/data/caddy-imports/nextcloud
# Makre sure that the caddy-imports dir is not empty
echo "# empty file so that caddy does not print a warning" > /mnt/data/caddy-imports/empty
# Fix apache startup
rm -f /usr/local/apache2/logs/httpd.pid
exec "$@"

View File

@@ -1,24 +1,20 @@
FROM debian:bullseye-20221205-slim
FROM alpine:3.17.3
RUN set -ex; \
\
echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/sources.list; \
apt-get update; \
apt-get install -y --no-install-recommends borgbackup -t bullseye-backports; \
apt-get install -y --no-install-recommends \
apk add --no-cache \
util-linux-misc \
bash \
borgbackup \
rsync \
fuse \
python3-llfuse \
jq \
; \
rm -rf /var/lib/apt/lists/*
py3-llfuse \
jq
VOLUME /root
COPY start.sh /usr/bin/
COPY backupscript.sh /
RUN chmod +x /usr/bin/start.sh; \
chmod +x /backupscript.sh
COPY --chmod=770 *.sh /
USER root
ENTRYPOINT ["start.sh"]
ENTRYPOINT ["/start.sh"]
LABEL com.centurylinklabs.watchtower.monitor-only="true"

View File

@@ -24,6 +24,14 @@ for directory in "${VOLUME_DIRS[@]}"; do
exit 1
fi
done
# Test if default volumes are there
DEFAULT_VOLUMES=(nextcloud_aio_apache nextcloud_aio_nextcloud nextcloud_aio_database nextcloud_aio_database_dump nextcloud_aio_elasticsearch nextcloud_aio_nextcloud_data nextcloud_aio_mastercontainer)
for volume in "${DEFAULT_VOLUMES[@]}"; do
if ! mountpoint -q "/nextcloud_aio_volumes/$volume"; then
echo "$volume is missing which is not intended."
exit 1
fi
done
# Check if target is mountpoint
if ! mountpoint -q /mnt/borgbackup; then
@@ -66,7 +74,7 @@ if [ "$BORG_MODE" = backup ]; then
# Test that nothing is empty
for directory in "${VOLUME_DIRS[@]}"; do
if [ -z "$(ls -A "$directory")" ]; then
if [ -z "$(ls -A "$directory")" ] && [ "$directory" != "/nextcloud_aio_volumes/nextcloud_aio_elasticsearch" ]; then
echo "$directory is empty which is not allowed."
exit 1
fi
@@ -86,9 +94,10 @@ if [ "$BORG_MODE" = backup ]; then
if ! [ -f "$BORG_BACKUP_DIRECTORY/config" ]; then
# Don't initialize if already initialized
if [ -f "/nextcloud_aio_volumes/nextcloud_aio_mastercontainer/data/borg.config" ]; then
echo "Cannot initialize a new repository as that was already done at least one time."
echo "If you still want to do so, you may delete the 'borg.config' file that is stored in the mastercontainer volume manually, which will allow you to initialize a new borg repository in the chosen directory."
echo "By default it is stored here: /var/lib/docker/volumes/nextcloud_aio_mastercontainer/_data/data/borg.config"
echo "No borg config file was found in the targeted directory."
echo "This might happen if the targeted directory is located on an external drive and the drive not connected anymore. You should check this."
echo "If you instead want to initialize a new backup repository, you may delete the 'borg.config' file that is stored in the mastercontainer volume manually, which will allow you to initialize a new borg repository in the chosen directory:"
echo "sudo docker exec nextcloud-aio-mastercontainer rm /mnt/docker-aio-config/data/borg.config"
exit 1
fi
@@ -127,15 +136,26 @@ if [ "$BORG_MODE" = backup ]; then
# Borg options
# auto,zstd compression seems to has the best ratio based on:
# https://forum.level1techs.com/t/optimal-compression-for-borg-backups/145870/6
BORG_OPTS=(--stats --compression "auto,zstd" --exclude-caches --checkpoint-interval 86400)
BORG_OPTS=(-v --stats --compression "auto,zstd" --exclude-caches)
# Exclude the nextcloud log and audit log for GDPR reasons
BORG_EXCLUDE=(--exclude "/nextcloud_aio_volumes/nextcloud_aio_nextcloud/data/nextcloud.log*" --exclude "/nextcloud_aio_volumes/nextcloud_aio_nextcloud/data/audit.log")
# Make sure that there is always a borg.config file before creating a new backup
if ! [ -f "/nextcloud_aio_volumes/nextcloud_aio_mastercontainer/data/borg.config" ]; then
echo "Did not find borg.config file in the mastercontainer volume."
echo "Cannot create a backup as this is wrong."
exit 1
fi
# Create the backup
echo "Starting the backup..."
get_start_time
if ! borg create "${BORG_OPTS[@]}" "$BORG_BACKUP_DIRECTORY::$CURRENT_DATE-nextcloud-aio" "/nextcloud_aio_volumes/"; then
if ! borg create "${BORG_OPTS[@]}" "${BORG_EXCLUDE[@]}" "$BORG_BACKUP_DIRECTORY::$CURRENT_DATE-nextcloud-aio" "/nextcloud_aio_volumes/"; then
echo "Deleting the failed backup archive..."
borg delete --stats "$BORG_BACKUP_DIRECTORY::$CURRENT_DATE-nextcloud-aio"
echo "Backup failed!"
echo "You might want to check the backup integrity via the AIO interface."
if [ "$NEW_REPOSITORY" = 1 ]; then
echo "Deleting borg.config file so that you can choose a different location for the backup."
rm "/nextcloud_aio_volumes/nextcloud_aio_mastercontainer/data/borg.config"
@@ -151,7 +171,7 @@ if [ "$BORG_MODE" = backup ]; then
# Prune archives
echo "Pruning the archives..."
if ! borg prune --prefix '*_*-nextcloud-aio' "${BORG_PRUNE_OPTS[@]}"; then
if ! borg prune --glob-archives '*_*-nextcloud-aio' "${BORG_PRUNE_OPTS[@]}"; then
echo "Failed to prune archives!"
exit 1
fi
@@ -174,16 +194,19 @@ if [ "$BORG_MODE" = backup ]; then
exit 1
fi
done
echo "Starting the backup for additional volumes..."
if ! borg create "${BORG_OPTS[@]}" "$BORG_BACKUP_DIRECTORY::$CURRENT_DATE-additional-docker-volumes" "/docker_volumes/"; then
echo "Deleting the failed backup archive..."
borg delete --stats "$BORG_BACKUP_DIRECTORY::$CURRENT_DATE-additional-docker-volumes"
echo "Backup of additional docker-volumes failed!"
exit 1
fi
if ! borg prune --prefix '*_*-additional-docker-volumes' "${BORG_PRUNE_OPTS[@]}"; then
echo "Pruning additional volumes..."
if ! borg prune --glob-archives '*_*-additional-docker-volumes' "${BORG_PRUNE_OPTS[@]}"; then
echo "Failed to prune additional docker-volumes archives!"
exit 1
fi
echo "Compacting additional volumes..."
if ! borg compact "$BORG_BACKUP_DIRECTORY"; then
echo "Failed to compact archives!"
exit 1
@@ -201,16 +224,19 @@ if [ "$BORG_MODE" = backup ]; then
do
EXCLUDE_DIRS+=(--exclude "/host_mounts/$directory/")
done
echo "Starting the backup for additional host mounts..."
if ! borg create "${BORG_OPTS[@]}" "${EXCLUDE_DIRS[@]}" "$BORG_BACKUP_DIRECTORY::$CURRENT_DATE-additional-host-mounts" "/host_mounts/"; then
echo "Deleting the failed backup archive..."
borg delete --stats "$BORG_BACKUP_DIRECTORY::$CURRENT_DATE-additional-host-mounts"
echo "Backup of additional host-mounts failed!"
exit 1
fi
if ! borg prune --prefix '*_*-additional-host-mounts' "${BORG_PRUNE_OPTS[@]}"; then
echo "Pruning additional host mounts..."
if ! borg prune --glob-archives '*_*-additional-host-mounts' "${BORG_PRUNE_OPTS[@]}"; then
echo "Failed to prune additional host-mount archives!"
exit 1
fi
echo "Compacting additional host mounts..."
if ! borg compact "$BORG_BACKUP_DIRECTORY"; then
echo "Failed to compact archives!"
exit 1
@@ -258,17 +284,18 @@ if [ "$BORG_MODE" = restore ]; then
# Restore everything except the configuration file
if ! rsync --stats --archive --human-readable -vv --delete \
--exclude "nextcloud_aio_mastercontainer/session/"** \
--exclude "nextcloud_aio_mastercontainer/certs/"** \
--exclude "nextcloud_aio_apache/caddy/**" \
--exclude "nextcloud_aio_mastercontainer/caddy/**" \
--exclude "nextcloud_aio_nextcloud/data/nextcloud.log*" \
--exclude "nextcloud_aio_nextcloud/data/audit.log" \
--exclude "nextcloud_aio_mastercontainer/certs/**" \
--exclude "nextcloud_aio_mastercontainer/data/configuration.json" \
--exclude "nextcloud_aio_mastercontainer/data/daily_backup_running" \
--exclude "nextcloud_aio_mastercontainer/data/session_date_file" \
--exclude "nextcloud_aio_mastercontainer/data/configuration.json" \
--exclude "nextcloud_aio_apache/caddy/"** \
--exclude "nextcloud_aio_mastercontainer/caddy/"** \
--exclude "nextcloud_aio_mastercontainer/session/**" \
/tmp/borg/nextcloud_aio_volumes/ /nextcloud_aio_volumes; then
RESTORE_FAILED=1
echo "Something failed while restoring from backup."
umount /tmp/borg
exit 1
fi
# Save current aio password
@@ -288,9 +315,8 @@ if [ "$BORG_MODE" = restore ]; then
if ! rsync --archive --human-readable -vv \
/tmp/borg/nextcloud_aio_volumes/nextcloud_aio_mastercontainer/data/configuration.json \
/nextcloud_aio_volumes/nextcloud_aio_mastercontainer/data/configuration.json; then
RESTORE_FAILED=1
echo "Something failed while restoring the configuration.json."
umount /tmp/borg
exit 1
fi
# Set backup-mode to restore since it was a restore
@@ -325,6 +351,10 @@ if [ "$BORG_MODE" = restore ]; then
umount /tmp/borg
if [ "$RESTORE_FAILED" = 1 ]; then
exit 1
fi
# Inform user
get_expiration_time
echo "Restore finished successfully on $END_DATE_READABLE ($DURATION_READABLE)"
@@ -336,6 +366,9 @@ if [ "$BORG_MODE" = restore ]; then
# Add file to Nextcloud container so that it performs a fingerprint update the next time
touch "/nextcloud_aio_volumes/nextcloud_aio_nextcloud_data/fingerprint.update"
chmod 777 "/nextcloud_aio_volumes/nextcloud_aio_nextcloud_data/fingerprint.update"
# Delete redis cache
rm -f "/mnt/redis/dump.rdb"
fi
# Do the Backup check
@@ -344,8 +377,26 @@ if [ "$BORG_MODE" = check ]; then
echo "Checking the backup integrity..."
# Perform the check
if ! borg check --verify-data "$BORG_BACKUP_DIRECTORY"; then
if ! borg check -v --verify-data "$BORG_BACKUP_DIRECTORY"; then
echo "Some errors were found while checking the backup integrity!"
echo "Check the AIO interface for advices on how to proceed now!"
exit 1
fi
# Inform user
get_expiration_time
echo "Check finished successfully on $END_DATE_READABLE ($DURATION_READABLE)"
exit 0
fi
# Do the Backup check-repair
if [ "$BORG_MODE" = "check-repair" ]; then
get_start_time
echo "Checking the backup integrity and repairing it..."
# Perform the check-repair
if ! echo YES | borg check -v --repair "$BORG_BACKUP_DIRECTORY"; then
echo "Some errors were found while checking and repairing the backup integrity!"
exit 1
fi

View File

@@ -20,7 +20,7 @@ export BORG_UNKNOWN_UNENCRYPTED_REPO_ACCESS_IS_OK=yes
export BORG_RELOCATED_REPO_ACCESS_IS_OK=yes
# Validate BORG_MODE
if [ "$BORG_MODE" != backup ] && [ "$BORG_MODE" != restore ] && [ "$BORG_MODE" != check ] && [ "$BORG_MODE" != test ]; then
if [ "$BORG_MODE" != backup ] && [ "$BORG_MODE" != restore ] && [ "$BORG_MODE" != check ] && [ "$BORG_MODE" != "check-repair" ] && [ "$BORG_MODE" != test ]; then
echo "No correct BORG_MODE mode applied. Valid are 'backup', 'check', 'restore' and 'test'."
exit 1
fi

View File

@@ -1,6 +1,10 @@
# Probably from this file: https://github.com/Cisco-Talos/clamav/blob/main/Dockerfile
FROM clamav/clamav:0.105.1-7
# Probably from this file: https://github.com/Cisco-Talos/clamav-docker/blob/main/clamav/1.1/alpine/Dockerfile
FROM clamav/clamav:1.1.0-1
RUN apk add --update --no-cache tzdata
COPY clamav.conf /tmp/
RUN cat /tmp/clamav.conf >> /etc/clamav/clamd.conf
COPY clamav.conf /tmp/clamav.conf
RUN set -ex; \
apk add --no-cache tzdata; \
cat /tmp/clamav.conf | tee -a /etc/clamav/clamd.conf; \
rm /tmp/clamav.conf
LABEL com.centurylinklabs.watchtower.monitor-only="true"

View File

@@ -1,5 +1,5 @@
# From a file located probably somewhere here: https://github.com/CollaboraOnline/online/tree/master/docker
FROM collabora/code:22.05.8.4.1
FROM collabora/code:22.05.14.3.1
USER root
@@ -16,3 +16,4 @@ RUN set -ex; \
USER 104
HEALTHCHECK CMD nc -z localhost 9980 || exit 1
LABEL com.centurylinklabs.watchtower.monitor-only="true"

View File

@@ -1,18 +1,17 @@
FROM alpine:3.16.3
RUN apk add --update --no-cache lighttpd bash curl netcat-openbsd
FROM alpine:3.17.3
RUN set -ex; \
apk add --no-cache bash lighttpd netcat-openbsd; \
adduser -S www-data -G www-data; \
rm -rf /etc/lighttpd/lighttpd.conf; \
chmod +r -R /etc/lighttpd; \
mkdir -p /var/www/domaincheck; \
chown www-data:www-data -R /var/www
COPY --chown=www-data:www-data lighttpd.conf /etc/lighttpd/lighttpd.conf
RUN adduser -S www-data -G www-data
RUN rm -rf /etc/lighttpd/lighttpd.conf
COPY lighttpd.conf /etc/lighttpd/lighttpd.conf
RUN chmod +r -R /etc/lighttpd && \
chown www-data:www-data -R /var/www && \
chown www-data:www-data /etc/lighttpd/lighttpd.conf
COPY start.sh /
RUN chmod +x /start.sh
COPY --chmod=775 start.sh /start.sh
USER www-data
RUN mkdir -p /var/www/domaincheck/
ENTRYPOINT ["/start.sh"]
HEALTHCHECK CMD nc -z localhost $APACHE_PORT || exit 1
HEALTHCHECK CMD nc -z localhost $APACHE_PORT || exit 1
LABEL com.centurylinklabs.watchtower.monitor-only="true"

View File

@@ -1,6 +1,15 @@
# Probably from here https://github.com/elastic/elasticsearch/blob/main/distribution/docker/src/docker/Dockerfile
FROM elasticsearch:7.17.7
FROM elasticsearch:7.17.10
RUN elasticsearch-plugin install --batch ingest-attachment
RUN set -ex; \
\
export DEBIAN_FRONTEND=noninteractive; \
apt-get update; \
apt-get install -y --no-install-recommends \
tzdata \
; \
rm -rf /var/lib/apt/lists/*; \
elasticsearch-plugin install --batch ingest-attachment
HEALTHCHECK CMD curl -skfI localhost:9200 || exit 1
HEALTHCHECK CMD nc -z localhost 9200 || exit 1
LABEL com.centurylinklabs.watchtower.monitor-only="true"

View File

@@ -1,18 +1,35 @@
# From https://github.com/h2non/imaginary/blob/master/Dockerfile
FROM nextcloud/imaginary:20221201
USER root
FROM golang:1.20.4-alpine3.17 as go
RUN set -ex; \
\
apt-get update; \
apt-get install -y --no-install-recommends \
apk add --no-cache \
vips-dev \
vips-magick \
vips-heif \
vips-jxl \
vips-poppler \
build-base; \
go install github.com/h2non/imaginary@b632dae8cc321452c3f85bcae79c580b1ae1ed84;
FROM alpine:3.17.3
RUN set -ex; \
apk add --no-cache \
tzdata \
ca-certificates \
curl \
netcat \
; \
rm -rf /var/lib/apt/lists/*
netcat-openbsd \
vips \
vips-magick \
vips-heif \
vips-jxl \
vips-poppler
COPY --from=go /go/bin/imaginary /usr/local/bin/imaginary
ENV PORT 9000
USER nobody
ENTRYPOINT ["/usr/local/bin/imaginary", "-return-size"]
# https://github.com/h2non/imaginary#memory-issues
ENV MALLOC_ARENA_MAX=2
ENTRYPOINT ["imaginary", "-return-size", "-max-allowed-resolution", "222.2"]
HEALTHCHECK CMD nc -z localhost 9000 || exit 1
HEALTHCHECK CMD nc -z localhost "$PORT" || exit 1
LABEL com.centurylinklabs.watchtower.monitor-only="true"

View File

@@ -6,17 +6,29 @@
storage file_system {
root /mnt/docker-aio-config/caddy/
}
log {
level ERROR
}
}
http://:80 {
redir https://{host}{uri}
}
https://:8443 {
# Match only host names and not ip-addresses:
https://*.*:8443,
https://*.*.*:8443,
https://*.*.*.*:8443,
https://*.*.*.*.*:8443,
https://*.*.*.*.*.*:8443 {
reverse_proxy localhost:8000
tls {
on_demand
issuer acme {
disable_tlsalpn_challenge
}
}
}

View File

@@ -1,112 +1,119 @@
# Docker CLI is a requirement
FROM docker:20.10.21-dind-alpine3.16 as dind
FROM docker:23.0.6-cli as docker
# Caddy is a requirement
FROM caddy:2.6.2-alpine as caddy
FROM caddy:2.6.4-alpine as caddy
# From https://github.com/docker-library/php/blob/master/8.0/bullseye/apache/Dockerfile
FROM php:8.0.26-apache-bullseye
# From https://github.com/docker-library/php/blob/master/8.2/alpine3.17/fpm/Dockerfile
FROM php:8.2.6-fpm-alpine3.17
EXPOSE 80
EXPOSE 8080
EXPOSE 8443
RUN mkdir -p /mnt/docker-aio-config/;
VOLUME /mnt/docker-aio-config/
RUN mkdir -p /var/www/docker-aio;
COPY --from=caddy /usr/bin/caddy /usr/bin/caddy
COPY --from=docker /usr/local/bin/docker /usr/local/bin/docker
WORKDIR /var/www/docker-aio
RUN apt-get update; \
apt-get install -y --no-install-recommends \
git \
RUN set -ex; \
apk add --no-cache shadow; \
groupmod -g 333 xfs; \
usermod -u 333 -g 333 xfs; \
groupmod -g 33 www-data; \
usermod -u 33 -g 33 www-data; \
\
apk add --no-cache \
util-linux-misc \
ca-certificates \
wget \
bash \
apache2 \
apache2-proxy \
apache2-ssl \
supervisor \
openssl \
sudo \
dpkg-dev \
netcat \
; \
rm -rf /var/lib/apt/lists/*
COPY --from=caddy /usr/bin/caddy /usr/bin/
RUN chmod +x /usr/bin/caddy
COPY --from=dind /usr/local/bin/docker /usr/local/bin/
RUN chmod +x /usr/local/bin/docker
RUN set -ex; \
netcat-openbsd \
curl \
grep; \
\
apk add --no-cache --virtual .build-deps \
autoconf \
build-base; \
pecl install APCu-5.1.22; \
docker-php-ext-enable apcu
RUN set -e && \
curl -sS https://getcomposer.org/installer | php && \
mv composer.phar /usr/local/bin/composer && \
chmod +x /usr/local/bin/composer && \
docker-php-ext-enable apcu; \
rm -r /tmp/pear; \
runDeps="$( \
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
| tr ',' '\n' \
| sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
)"; \
apk add --virtual .nextcloud-aio-rundeps $runDeps; \
apk del .build-deps; \
grep -q '^pm = dynamic' /usr/local/etc/php-fpm.d/www.conf; \
sed -i 's/^pm = dynamic/pm = ondemand/' /usr/local/etc/php-fpm.d/www.conf; \
sed -i 's/^pm.max_children =.*/pm.max_children = 80/' /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; \
\
apk add --no-cache git; \
wget https://getcomposer.org/installer -O - | php -- --install-dir=/usr/local/bin --filename=composer; \
chmod +x /usr/local/bin/composer; \
cd /var/www/docker-aio; \
git clone https://github.com/nextcloud-releases/all-in-one.git --depth 1 .; \
find ./ -not -path ./php -maxdepth 1 -mindepth 1 -delete; \
chown www-data:www-data -R /var/www/docker-aio; \
cd php; \
composer install --no-dev; \
composer clearcache; \
sudo -u www-data composer install --no-dev; \
sudo -u www-data composer clear-cache; \
cd ..; \
rm -f /usr/local/bin/composer; \
chmod 770 -R ./; \
chown www-data:www-data -R /var/www; \
rm -r ./php/data; \
rm -r ./php/session
RUN mkdir -p /etc/apache2/certs && \
cd /etc/apache2/certs && \
openssl req -new -newkey rsa:4096 -days 3650 -nodes -x509 -subj "/C=DE/ST=BE/L=Local/O=Dev/CN=nextcloud.local" -keyout ./ssl.key -out ./ssl.crt;
COPY mastercontainer.conf /etc/apache2/sites-available/
RUN a2enmod rewrite \
headers \
env \
mime \
dir \
authz_core \
proxy \
proxy_http \
ssl
RUN rm /etc/apache2/ports.conf; \
sed -s -i -e "s/Include ports.conf//" /etc/apache2/apache2.conf; \
sed -i "/^Listen /d" /etc/apache2/apache2.conf
RUN set -ex; \
a2dissite 000-default && \
a2dissite default-ssl && \
rm -f /etc/apache2/sites-enabled/000-default.conf && \
rm -f /etc/apache2/sites-enabled/default-ssl.conf && \
rm /etc/apache2/sites-available/000-default.conf && \
rm /etc/apache2/sites-available/default-ssl.conf && \
a2ensite mastercontainer.conf
RUN mkdir /var/log/supervisord; \
chmod -R 770 /var/www/docker-aio; \
chown -R www-data:www-data /var/www; \
rm -r php/data; \
rm -r php/session; \
\
mkdir -p /etc/apache2/certs; \
cd /etc/apache2/certs; \
openssl req -new -newkey rsa:4096 -days 3650 -nodes -x509 -subj "/C=DE/ST=BE/L=Local/O=Dev/CN=nextcloud.local" -keyout /etc/apache2/certs/ssl.key -out /etc/apache2/certs/ssl.crt; \
\
sed -i \
-e '/^Listen /d' \
-e 's/User apache/User www-data/g' \
-e 's/Group apache/Group www-data/g' \
-e 's/^#\(LoadModule .*mod_rewrite.so\)/\1/' \
-e 's/^#\(LoadModule .*mod_headers.so\)/\1/' \
-e 's/^#\(LoadModule .*mod_env.so\)/\1/' \
-e 's/^#\(LoadModule .*mod_mime.so\)/\1/' \
-e 's/^#\(LoadModule .*mod_dir.so\)/\1/' \
-e 's/^#\(LoadModule .*mod_authz_core.so\)/\1/' \
-e 's/^#\(LoadModule .*mod_mpm_event.so\)/\1/' \
-e 's/\(LoadModule .*mod_mpm_worker.so\)/#\1/' \
-e 's/\(LoadModule .*mod_mpm_prefork.so\)/#\1/' \
/etc/apache2/httpd.conf; \
mkdir -p /etc/apache2/logs; \
rm /etc/apache2/conf.d/ssl.conf; \
echo "ServerName localhost" | tee -a /etc/apache2/httpd.conf; \
echo "LoadModule ssl_module modules/mod_ssl.so" | tee -a /etc/apache2/httpd.conf; \
echo "LoadModule socache_shmcb_module modules/mod_socache_shmcb.so" | tee -a /etc/apache2/httpd.conf; \
echo "Include /etc/apache2/sites-available/mastercontainer.conf" | tee -a /etc/apache2/httpd.conf; \
\
rm -f /etc/apache2/conf.d/default.conf \
/etc/apache2/conf.d/userdir.conf \
/etc/apache2/conf.d/info.conf; \
\
mkdir /var/log/supervisord; \
mkdir /var/run/supervisord;
COPY Caddyfile /
COPY start.sh /usr/bin/
COPY backup-time-file-watcher.sh /
COPY session-deduplicator.sh /
COPY cron.sh /
COPY daily-backup.sh /
COPY supervisord.conf /
COPY healthcheck.sh /
RUN chmod +x /usr/bin/start.sh; \
chmod +x /cron.sh; \
chmod +x /session-deduplicator.sh; \
chmod +x /backup-time-file-watcher.sh; \
chmod +x /daily-backup.sh; \
chmod a+r /Caddyfile; \
chmod +x /healthcheck.sh
COPY --chmod=775 *.sh /
COPY --chmod=664 Caddyfile /Caddyfile
COPY --chmod=664 supervisord.conf /supervisord.conf
COPY mastercontainer.conf /etc/apache2/sites-available/mastercontainer.conf
USER root
ENTRYPOINT ["start.sh"]
ENTRYPOINT ["/start.sh"]
CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]
HEALTHCHECK CMD /healthcheck.sh
HEALTHCHECK CMD /healthcheck.sh

View File

@@ -38,8 +38,10 @@ while true; do
# Make sure to delete the lock file always
rm -f "/mnt/docker-aio-config/data/daily_backup_running"
# Check for updates and send notification if yes
sudo -u www-data php /var/www/docker-aio/php/src/Cron/UpdateNotification.php
# Check for updates and send notification if yes on saturdays
if [ "$(date +%u)" = 6 ]; then
sudo -u www-data php /var/www/docker-aio/php/src/Cron/UpdateNotification.php
fi
# Check if AIO is outdated
sudo -u www-data php /var/www/docker-aio/php/src/Cron/OutdatedNotification.php
@@ -47,8 +49,13 @@ while true; do
# Remove sessions older than 24h
find "/mnt/docker-aio-config/session/" -mindepth 1 -mmin +1440 -delete
# Remove nextcloud-aio-domaincheck container
if sudo -u www-data docker ps --format "{{.Names}}" --filter "status=exited" | grep -q "^nextcloud-aio-domaincheck$"; then
sudo -u www-data docker container remove nextcloud-aio-domaincheck
fi
# Remove dangling images
sudo -u www-data docker image prune -f
sudo -u www-data docker image prune --force
# Wait 60s so that the whole loop will not be executed again
sleep 60

View File

@@ -11,7 +11,7 @@ fi
# Delete all active sessions and create a lock file
# But don't kick out the user if the mastercontainer was just updated since we block the interface either way with the lock file
if [ "$LOCK_FILE_PRESENT" = 0 ] || ! [ -f "/mnt/docker-aio-config/data/daily_backup_running" ]; then
rm -f "/mnt/docker-aio-config/session/"*
find "/mnt/docker-aio-config/session/" -mindepth 1 -delete
fi
sudo -u www-data touch "/mnt/docker-aio-config/data/daily_backup_running"
@@ -38,9 +38,10 @@ if [ "$AUTOMATIC_UPDATES" = 1 ]; then
fi
# Wait for watchtower to stop
if [ "$AUTOMATIC_UPDATES" = 1 ] && ! docker ps --format "{{.Names}}" | grep -q "^nextcloud-aio-watchtower$"; then
echo "Something seems to be wrong: Watchtower should be started at this step."
else
if [ "$AUTOMATIC_UPDATES" = 1 ]; then
if ! docker ps --format "{{.Names}}" | grep -q "^nextcloud-aio-watchtower$"; then
echo "Something seems to be wrong: Watchtower should be started at this step."
fi
while docker ps --format "{{.Names}}" | grep -q "^nextcloud-aio-watchtower$"; do
echo "Waiting for watchtower to stop"
sleep 30
@@ -58,6 +59,13 @@ fi
if [ "$DAILY_BACKUP" = 1 ]; then
echo "Creating daily backup..."
sudo -u www-data php /var/www/docker-aio/php/src/Cron/CreateBackup.php
if ! docker ps --format "{{.Names}}" | grep -q "^nextcloud-aio-borgbackup$"; then
echo "Something seems to be wrong: the borg container should be started at this step."
fi
while docker ps --format "{{.Names}}" | grep -q "^nextcloud-aio-borgbackup$"; do
echo "Waiting for backup container to stop"
sleep 30
done
fi
# Execute backup check

View File

@@ -10,9 +10,13 @@ Listen 8080
<VirtualHost *:8000>
ServerName localhost
# Add error log
CustomLog /proc/self/fd/1 combined
ErrorLog /proc/self/fd/2
# PHP match
<FilesMatch "\.php$">
SetHandler application/x-httpd-php
SetHandler "proxy:fcgi://localhost:9000"
</FilesMatch>
# Master dir
DocumentRoot /var/www/docker-aio/php/public/

View File

@@ -6,6 +6,12 @@ print_green() {
printf "%b%s%b\n" "\e[0;92m" "$TEXT" "\e[0m"
}
# Function to show text in red
print_red() {
local TEXT="$1"
printf "%b%s%b\n" "\e[0;31m" "$TEXT" "\e[0m"
}
# Function to check if number was provided
check_if_number() {
case "${1}" in
@@ -14,12 +20,19 @@ case "${1}" in
esac
}
# Check if running as root user
if [ "$EUID" != "0" ]; then
print_red "Container does not run as root user. This is not supported."
exit 1
fi
# Check if socket is available and readable
if ! [ -a "/var/run/docker.sock" ]; then
echo "Docker socket is not available. Cannot continue."
print_red "Docker socket is not available. Cannot continue."
echo "If you did this by purpose because you don't want the container to have access to the docker socket, see https://github.com/nextcloud/all-in-one/tree/main/manual-install."
exit 1
elif ! mountpoint -q "/mnt/docker-aio-config"; then
echo "/mnt/docker-aio-config is not a mountpoint. Cannot proceed!"
print_red "/mnt/docker-aio-config is not a mountpoint. Cannot proceed!"
exit 1
elif ! sudo -u www-data test -r /var/run/docker.sock; then
echo "Trying to fix docker.sock permissions internally..."
@@ -40,14 +53,14 @@ elif ! sudo -u www-data test -r /var/run/docker.sock; then
usermod -aG docker www-data
fi
if ! sudo -u www-data test -r /var/run/docker.sock; then
echo "Docker socket is not readable by the www-data user. Cannot continue."
print_red "Docker socket is not readable by the www-data user. Cannot continue."
exit 1
fi
fi
# Check if api version is supported
if ! sudo -u www-data docker info &>/dev/null; then
echo "Cannot connect to the docker socket. Cannot proceed."
print_red "Cannot connect to the docker socket. Cannot proceed."
exit 1
fi
API_VERSION_FILE="$(find ./ -name DockerActionManager.php | head -1)"
@@ -57,7 +70,7 @@ API_VERSION_NUMB="$(echo "$API_VERSION" | sed 's/\.//')"
LOCAL_API_VERSION_NUMB="$(sudo -u www-data docker version | grep -i "api version" | grep -oP '[0-9]+.[0-9]+' | head -1 | sed 's/\.//')"
if [ -n "$LOCAL_API_VERSION_NUMB" ] && [ -n "$API_VERSION_NUMB" ]; then
if ! [ "$LOCAL_API_VERSION_NUMB" -ge "$API_VERSION_NUMB" ]; then
echo "Docker API v$API_VERSION is not supported by your docker engine. Cannot proceed. Please upgrade your docker engine if you want to run Nextcloud AIO!"
print_red "Docker API v$API_VERSION is not supported by your docker engine. Cannot proceed. Please upgrade your docker engine if you want to run Nextcloud AIO!"
exit 1
fi
else
@@ -77,47 +90,52 @@ elif echo "$STORAGE_DRIVER" | grep -q fuse-overlayfs; then
fi
# Check if startup command was executed correctly
if ! sudo -u www-data docker ps | grep -q "nextcloud-aio-mastercontainer"; then
echo "It seems like you did not give the mastercontainer the correct name?
Using a different name is not supported!"
if ! sudo -u www-data docker ps --format "{{.Names}}" | grep -q "^nextcloud-aio-mastercontainer$"; then
print_red "It seems like you did not give the mastercontainer the correct name? (The 'nextcloud-aio-mastercontainer' container was not found.)
Using a different name is not supported since mastercontainer updates will not work in that case!
If you are on docker swarm and try to run AIO, see https://github.com/nextcloud/all-in-one#can-i-run-this-with-docker-swarm"
exit 1
elif ! sudo -u www-data docker volume ls | grep -q "nextcloud_aio_mastercontainer"; then
echo "It seems like you did not give the mastercontainer volume the correct name?
Using a different name is not supported!"
elif ! sudo -u www-data docker volume ls --format "{{.Name}}" | grep -q "^nextcloud_aio_mastercontainer$"; then
print_red "It seems like you did not give the mastercontainer volume the correct name? (The 'nextcloud_aio_mastercontainer' volume was not found.)
Using a different name is not supported since the built-in backup solution will not work in that case!"
exit 1
elif ! sudo -u www-data docker inspect nextcloud-aio-mastercontainer | grep -q "nextcloud_aio_mastercontainer"; then
print_red "It seems like you did not attach the 'nextcloud_aio_mastercontainer' volume to the mastercontainer?
This is not supported since the built-in backup solution will not work in that case!"
exit 1
fi
# Check for other options
if [ -n "$NEXTCLOUD_DATADIR" ]; then
if [ "$NEXTCLOUD_DATADIR" = "nextcloud_aio_nextcloud_datadir" ]; then
echo "NEXTCLOUD_DATADIR is set to $NEXTCLOUD_DATADIR"
sleep 1
elif ! echo "$NEXTCLOUD_DATADIR" | grep -q "^/" || [ "$NEXTCLOUD_DATADIR" = "/" ]; then
echo "You've set NEXTCLOUD_DATADIR but not to an allowed value.
The string must start with '/' and must not be equal to '/'.
print_red "You've set NEXTCLOUD_DATADIR but not to an allowed value.
The string must start with '/' and must not be equal to '/'. Also allowed is 'nextcloud_aio_nextcloud_datadir'.
It is set to '$NEXTCLOUD_DATADIR'."
exit 1
fi
fi
if [ -n "$NEXTCLOUD_MOUNT" ]; then
if ! echo "$NEXTCLOUD_MOUNT" | grep -q "^/" || [ "$NEXTCLOUD_MOUNT" = "/" ]; then
echo "You've set NEXCLOUD_MOUNT but not to an allowed value.
print_red "You've set NEXCLOUD_MOUNT but not to an allowed value.
The string must start with '/' and must not be equal to '/'.
It is set to '$NEXTCLOUD_MOUNT'."
exit 1
elif [ "$NEXTCLOUD_MOUNT" = "/mnt/ncdata" ] || echo "$NEXTCLOUD_MOUNT" | grep -q "^/mnt/ncdata/"; then
echo "'/mnt/ncdata' and '/mnt/ncdata/' are not allowed as values for NEXTCLOUD_MOUNT."
print_red "'/mnt/ncdata' and '/mnt/ncdata/' are not allowed as values for NEXTCLOUD_MOUNT."
exit 1
fi
fi
if [ -n "$NEXTCLOUD_DATADIR" ] && [ -n "$NEXTCLOUD_MOUNT" ]; then
if [ "$NEXTCLOUD_DATADIR" = "$NEXTCLOUD_MOUNT" ]; then
echo "NEXTCLOUD_DATADIR and NEXTCLOUD_MOUNT are not allowed to be equal."
print_red "NEXTCLOUD_DATADIR and NEXTCLOUD_MOUNT are not allowed to be equal."
exit 1
fi
fi
if [ -n "$NEXTCLOUD_UPLOAD_LIMIT" ]; then
if ! echo "$NEXTCLOUD_UPLOAD_LIMIT" | grep -q '^[0-9]\+G$'; then
echo "You've set NEXTCLOUD_UPLOAD_LIMIT but not to an allowed value.
print_red "You've set NEXTCLOUD_UPLOAD_LIMIT but not to an allowed value.
The string must start with a number and end with 'G'.
It is set to '$NEXTCLOUD_UPLOAD_LIMIT'."
exit 1
@@ -125,7 +143,7 @@ It is set to '$NEXTCLOUD_UPLOAD_LIMIT'."
fi
if [ -n "$NEXTCLOUD_MAX_TIME" ]; then
if ! echo "$NEXTCLOUD_MAX_TIME" | grep -q '^[0-9]\+$'; then
echo "You've set NEXTCLOUD_MAX_TIME but not to an allowed value.
print_red "You've set NEXTCLOUD_MAX_TIME but not to an allowed value.
The string must be a number. E.g. '3600'.
It is set to '$NEXTCLOUD_MAX_TIME'."
exit 1
@@ -133,7 +151,7 @@ It is set to '$NEXTCLOUD_MAX_TIME'."
fi
if [ -n "$NEXTCLOUD_MEMORY_LIMIT" ]; then
if ! echo "$NEXTCLOUD_MEMORY_LIMIT" | grep -q '^[0-9]\+M$'; then
echo "You've set NEXTCLOUD_MEMORY_LIMIT but not to an allowed value.
print_red "You've set NEXTCLOUD_MEMORY_LIMIT but not to an allowed value.
The string must start with a number and end with 'M'.
It is set to '$NEXTCLOUD_MEMORY_LIMIT'."
exit 1
@@ -141,64 +159,64 @@ It is set to '$NEXTCLOUD_MEMORY_LIMIT'."
fi
if [ -n "$APACHE_PORT" ]; then
if ! check_if_number "$APACHE_PORT"; then
echo "You provided an Apache port but did not only use numbers.
print_red "You provided an Apache port but did not only use numbers.
It is set to '$APACHE_PORT'."
exit 1
elif ! [ "$APACHE_PORT" -le 65535 ] || ! [ "$APACHE_PORT" -ge 1 ]; then
echo "The provided Apache port is invalid. It must be between 1 and 65535"
print_red "The provided Apache port is invalid. It must be between 1 and 65535"
exit 1
fi
fi
if [ -n "$APACHE_IP_BINDING" ]; then
if ! echo "$APACHE_IP_BINDING" | grep -q '^[0-9.]\+$'; then
echo "You provided an ip-address for the apache container's ip-binding but it was not a valid ip-address.
print_red "You provided an ip-address for the apache container's ip-binding but it was not a valid ip-address.
It is set to '$APACHE_IP_BINDING'."
exit 1
fi
fi
if [ -n "$TALK_PORT" ]; then
if ! check_if_number "$TALK_PORT"; then
echo "You provided an Talk port but did not only use numbers.
print_red "You provided an Talk port but did not only use numbers.
It is set to '$TALK_PORT'."
exit 1
elif ! [ "$TALK_PORT" -le 65535 ] || ! [ "$TALK_PORT" -ge 1 ]; then
echo "The provided Talk port is invalid. It must be between 1 and 65535"
print_red "The provided Talk port is invalid. It must be between 1 and 65535"
exit 1
fi
fi
if [ -n "$APACHE_PORT" ] && [ -n "$TALK_PORT" ]; then
if [ "$APACHE_PORT" = "$TALK_PORT" ]; then
echo "APACHE_PORT and TALK_PORT are not allowed to be equal."
print_red "APACHE_PORT and TALK_PORT are not allowed to be equal."
exit 1
fi
fi
if [ -n "$DOCKER_SOCKET_PATH" ]; then
if ! echo "$DOCKER_SOCKET_PATH" | grep -q "^/" || echo "$DOCKER_SOCKET_PATH" | grep -q "/$"; then
echo "You've set DOCKER_SOCKET_PATH but not to an allowed value.
if [ -n "$WATCHTOWER_DOCKER_SOCKET_PATH" ]; then
if ! echo "$WATCHTOWER_DOCKER_SOCKET_PATH" | grep -q "^/" || echo "$WATCHTOWER_DOCKER_SOCKET_PATH" | grep -q "/$"; then
print_red "You've set WATCHTOWER_DOCKER_SOCKET_PATH but not to an allowed value.
The string must start with '/' and must not end with '/'.
It is set to '$DOCKER_SOCKET_PATH'."
It is set to '$WATCHTOWER_DOCKER_SOCKET_PATH'."
exit 1
fi
fi
if [ -n "$NEXTCLOUD_TRUSTED_CACERTS_DIR" ]; then
if ! echo "$NEXTCLOUD_TRUSTED_CACERTS_DIR" | grep -q "^/" || echo "$NEXTCLOUD_TRUSTED_CACERTS_DIR" | grep -q "/$"; then
echo "You've set NEXTCLOUD_TRUSTED_CACERTS_DIR but not to an allowed value.
print_red "You've set NEXTCLOUD_TRUSTED_CACERTS_DIR but not to an allowed value.
It should be an absolute path to a directory that starts with '/' but not end with '/'.
It is set to '$NEXTCLOUD_TRUSTED_CACERTS_DIR '."
exit 1
fi
fi
if [ -n "$NEXTCLOUD_STARTUP_APPS" ]; then
if ! echo "$NEXTCLOUD_STARTUP_APPS" | grep -q "^[a-z _-]\+$"; then
echo "You've set NEXTCLOUD_STARTUP_APPS but not to an allowed value.
It needs to be a string. Allowed are small letters a-z, spaces, hyphens and '_'.
if ! echo "$NEXTCLOUD_STARTUP_APPS" | grep -q "^[a-z0-9 _-]\+$"; then
print_red "You've set NEXTCLOUD_STARTUP_APPS but not to an allowed value.
It needs to be a string. Allowed are small letters a-z, 0-9, spaces, hyphens and '_'.
It is set to '$NEXTCLOUD_STARTUP_APPS'."
exit 1
fi
fi
if [ -n "$NEXTCLOUD_ADDITIONAL_APKS" ]; then
if ! echo "$NEXTCLOUD_ADDITIONAL_APKS" | grep -q "^[a-z0-9 ._-]\+$"; then
echo "You've set NEXTCLOUD_ADDITIONAL_APKS but not to an allowed value.
print_red "You've set NEXTCLOUD_ADDITIONAL_APKS but not to an allowed value.
It needs to be a string. Allowed are small letters a-z, digits 0-9, spaces, hyphens, dots and '_'.
It is set to '$NEXTCLOUD_ADDITIONAL_APKS'."
exit 1
@@ -206,7 +224,7 @@ It is set to '$NEXTCLOUD_ADDITIONAL_APKS'."
fi
if [ -n "$NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS" ]; then
if ! echo "$NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS" | grep -q "^[a-z0-9 ._-]\+$"; then
echo "You've set NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS but not to an allowed value.
print_red "You've set NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS but not to an allowed value.
It needs to be a string. Allowed are small letters a-z, digits 0-9, spaces, hyphens, dots and '_'.
It is set to '$NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS'."
exit 1
@@ -217,9 +235,10 @@ fi
# Prevents issues like https://github.com/nextcloud/all-in-one/discussions/565
curl https://nextcloud.com &>/dev/null
if [ "$?" = 6 ]; then
echo "Could not resolve the host nextcloud.com."
print_red "Could not resolve the host nextcloud.com."
echo "Most likely the DNS resolving does not work."
echo "You should be able to fix this by adding the '--dns=\"ip.address.of.dns.server\"' option to the docker run command."
echo "You should be able to fix this by following https://dockerlabs.collabnix.com/intermediate/networking/Configuring_DNS.html"
echo "Apart from that, there has been this: https://github.com/nextcloud/all-in-one/discussions/2065"
exit 1
fi
@@ -239,8 +258,8 @@ chown root:root -R /mnt/docker-aio-config/certs/
# Don't allow access to the AIO interface from the Nextcloud container
# Probably more cosmetic than anything but at least an attempt
if ! grep -q '# nextcloud-aio-block' /etc/apache2/apache2.conf; then
cat << APACHE_CONF >> /etc/apache2/apache2.conf
if ! grep -q '# nextcloud-aio-block' /etc/apache2/httpd.conf; then
cat << APACHE_CONF >> /etc/apache2/httpd.conf
# nextcloud-aio-block-start
<Location />
order allow,deny
@@ -267,7 +286,7 @@ if [ -f ./ssl.crt ] && [ -f ./ssl.key ]; then
cp "$GENERATED_CERTS/ssl.key" ./
fi
print_green "Initial startup of Nextcloud All In One complete!
print_green "Initial startup of Nextcloud All-in-One complete!
You should be able to open the Nextcloud AIO Interface now on port 8080 of this server!
E.g. https://internal.ip.of.this.server:8080
@@ -277,4 +296,13 @@ https://your-domain-that-points-to-this-server.tld:8443"
# Set the timezone to UTC
export TZ=UTC
# Fix apache startup
rm -f /var/run/apache2/httpd.pid
# Fix the Caddyfile format
caddy fmt --overwrite /Caddyfile
# Fix caddy log
chmod 777 /root
exec "$@"

View File

@@ -8,12 +8,20 @@ logfile_backups=10
loglevel=error
user=root
[program:php-fpm]
# stdout_logfile=/dev/stdout
# stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
command=php-fpm
user=root
[program:apache]
# stdout_logfile=/dev/stdout
# stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
command=apache2-foreground
command=httpd -DFOREGROUND
user=root
[program:caddy]

View File

@@ -1,5 +1,5 @@
# From https://github.com/nextcloud/docker/blob/master/23/fpm-alpine/Dockerfile
FROM php:8.0.26-fpm-alpine3.16
FROM php:8.0.28-fpm-alpine3.16
# Custom: change id of www-data user as it needs to be the same like on old installations
RUN set -ex; \
@@ -28,19 +28,20 @@ RUN set -ex; \
$PHPIZE_DEPS \
autoconf \
freetype-dev \
gmp-dev \
icu-dev \
imagemagick-dev \
libevent-dev \
libjpeg-turbo-dev \
libmcrypt-dev \
libpng-dev \
libmemcached-dev \
libpng-dev \
libwebp-dev \
libxml2-dev \
libzip-dev \
openldap-dev \
pcre-dev \
postgresql-dev \
libwebp-dev \
gmp-dev \
; \
\
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
@@ -49,20 +50,21 @@ RUN set -ex; \
bcmath \
exif \
gd \
gmp \
intl \
ldap \
opcache \
pcntl \
pdo_mysql \
pdo_pgsql \
sysvsem \
zip \
gmp \
; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.22; \
pecl install memcached-3.2.0; \
pecl install redis-5.3.7; \
pecl install imagick-3.7.0; \
\
docker-php-ext-enable \
apcu \
@@ -86,6 +88,8 @@ RUN { \
echo 'opcache.interned_strings_buffer=32'; \
echo 'opcache.save_comments=1'; \
echo 'opcache.revalidate_freq=60'; \
echo 'opcache.jit=1255'; \
echo 'opcache.jit_buffer_size=128M'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
\
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
@@ -104,7 +108,7 @@ RUN { \
VOLUME /var/www/html
ENV NEXTCLOUD_VERSION 24.0.8
ENV NEXTCLOUD_VERSION 25.0.6
RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \
@@ -155,12 +159,14 @@ RUN set -ex; \
openssl-dev \
samba-dev \
bzip2-dev \
libpq-dev \
; \
\
docker-php-ext-configure imap --with-kerberos --with-imap-ssl; \
docker-php-ext-install \
bz2 \
imap \
pgsql \
; \
pecl install smbclient; \
docker-php-ext-enable smbclient; \
@@ -199,8 +205,8 @@ RUN set -ex; \
mawk \
sudo \
grep \
; \
rm -rf /var/lib/apt/lists/*
nodejs \
coreutils;
RUN set -ex; \
grep -q '^pm = dynamic' /usr/local/etc/php-fpm.d/www.conf; \
@@ -235,7 +241,8 @@ RUN set -ex; \
chmod +x /cron.sh && \
chmod +x /notify.sh && \
chmod +x /notify-all.sh && \
chmod +x /activate-collabora.sh
chmod +x /activate-collabora.sh && \
chmod +x /healthcheck.sh
RUN set -ex; \
mkdir /mnt/ncdata; \
@@ -243,10 +250,16 @@ RUN set -ex; \
VOLUME /mnt/ncdata
RUN set -ex; \
mkdir -p /nc-updater; \
chown -R www-data:www-data /nc-updater; \
chmod -R 770 /nc-updater
# Give root a random password
RUN echo "root:$(openssl rand -base64 12)" | chpasswd
USER root
ENTRYPOINT ["/start.sh"]
HEALTHCHECK CMD (sudo -u www-data nc -z localhost 9000 && sudo -u www-data nc -z localhost 7867) || exit 1
HEALTHCHECK CMD sudo -E -u www-data bash /healthcheck.sh
LABEL com.centurylinklabs.watchtower.monitor-only="true"

View File

@@ -39,7 +39,10 @@ $(stat -c "%u:%g %a" "$NEXTCLOUD_DATA_DIR")
(userID:groupID permissions)
but they should be:
33:0 750
(userID:groupID permissions)"
(userID:groupID permissions)
Also make sure that the parent directories on the host of the directory that you've chosen as datadir are publicly readable with e.g. 'sudo chmod +r /mnt' (adjust the command accordingly to your case) and the same for all subdirectories.
Additionally, if you want to use a Fuse-mount as datadir, set 'allow_other' as additional mount option.
For SMB/CIFS mounts as datadir, see https://github.com/nextcloud/all-in-one#can-i-use-a-cifssmb-share-as-nextclouds-datadir"
exit 1
fi
rm "$NEXTCLOUD_DATA_DIR/this-is-a-test-file"
@@ -79,6 +82,14 @@ if [ -f "$NEXTCLOUD_DATA_DIR/update.failed" ]; then
exit 1
fi
# Do not start the container if the install failed
if [ -f "$NEXTCLOUD_DATA_DIR/install.failed" ]; then
echo "The initial Nextcloud installation failed."
echo "Please reset AIO properly and try again. For further clues what went wrong, check the logs above."
echo "See https://github.com/nextcloud/all-in-one#how-to-properly-reset-the-instance"
exit 1
fi
# Skip any update if Nextcloud was just restored
if ! [ -f "$NEXTCLOUD_DATA_DIR/skip.update" ]; then
if version_greater "$image_version" "$installed_version"; then
@@ -109,9 +120,9 @@ 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 /usr/src/nextcloud/config/* /usr/src/tmp/nextcloud/config/
cp -r /usr/src/nextcloud/config/* /usr/src/tmp/nextcloud/config/
mkdir -p /usr/src/tmp/nextcloud/apps/nextcloud-aio
cp /usr/src/nextcloud/apps/nextcloud-aio/* /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
rm -r /usr/src/tmp
@@ -176,12 +187,18 @@ if ! [ -f "$NEXTCLOUD_DATA_DIR/skip.update" ]; then
rsync -rlD --include "/$dir/" --exclude '/*' /usr/src/nextcloud/ /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/
echo "Initializing finished"
#install
if [ "$installed_version" = "0.0.0.0" ]; then
echo "New nextcloud instance"
echo "New Nextcloud instance."
# Write output to logfile.
mkdir -p /var/www/html/data
exec > >(tee -i "/var/www/html/data/install.log")
exec 2>&1
INSTALL_OPTIONS=(-n --admin-user "$ADMIN_USER" --admin-pass "$ADMIN_PASSWORD")
if [ -n "${NEXTCLOUD_DATA_DIR}" ]; then
@@ -191,25 +208,78 @@ if ! [ -f "$NEXTCLOUD_DATA_DIR/skip.update" ]; then
echo "Installing with PostgreSQL database"
INSTALL_OPTIONS+=(--database pgsql --database-name "$POSTGRES_DB" --database-user "$POSTGRES_USER" --database-pass "$POSTGRES_PASSWORD" --database-host "$POSTGRES_HOST")
echo "starting nextcloud installation"
max_retries=10
try=0
until php /var/www/html/occ maintenance:install "${INSTALL_OPTIONS[@]}" || [ "$try" -gt "$max_retries" ]
do
echo "retrying install..."
try=$((try+1))
sleep 10s
done
if [ "$try" -gt "$max_retries" ]; then
echo "installing of nextcloud failed!"
echo "Starting Nextcloud installation..."
if ! php /var/www/html/occ maintenance:install "${INSTALL_OPTIONS[@]}"; then
echo "Installation of Nextcloud failed!"
touch "$NEXTCLOUD_DATA_DIR/install.failed"
exit 1
fi
# We do our own permission check so the permission check is not needed
cat << DATADIR_PERMISSION_CONF > /var/www/html/config/datadir.permission.config.php
<?php
\$CONFIG = array (
'check_data_directory_permissions' => false
);
DATADIR_PERMISSION_CONF
php /var/www/html/occ config:system:set check_data_directory_permissions --value=false --type=bool
# Try to force generation of appdata dir:
php /var/www/html/occ maintenance:repair
if [ -z "$OBJECTSTORE_S3_BUCKET" ] && [ -z "$OBJECTSTORE_SWIFT_URL" ]; then
max_retries=10
try=0
while [ -z "$(find "$NEXTCLOUD_DATA_DIR/" -maxdepth 1 -mindepth 1 -type d -name "appdata_*")" ] && [ "$try" -lt "$max_retries" ]; do
echo "Waiting for appdata to become available..."
try=$((try+1))
sleep 10s
done
if [ "$try" -ge "$max_retries" ]; then
echo "Installation of Nextcloud failed!"
echo "Install errors: $(cat /var/www/html/data/nextcloud.log)"
touch "$NEXTCLOUD_DATA_DIR/install.failed"
exit 1
fi
fi
# This autoconfig is not needed anymore and should be able to be overwritten by the user
rm /var/www/html/config/datadir.permission.config.php
# unset admin password
unset ADMIN_PASSWORD
# Post Install logs: For questions like https://help.nextcloud.com/t/nextcloud-aio-error-could-not-get-appdata-folder-after-container-has-already-written-data-in-it/151122/5
echo "Install errors: $(cat /var/www/html/data/nextcloud.log)"
if [ "$INSTALL_LATEST_MAJOR" = yes ]; then
php /var/www/html/occ config:system:set updater.release.channel --value=beta
php /var/www/html/occ config:system:set updatedirectory --value="/nc-updater"
php /var/www/html/updater/updater.phar --no-interaction
php /var/www/html/occ app:enable nextcloud-aio --force
if ! php /var/www/html/occ -V || php /var/www/html/occ status | grep maintenance | grep -q 'true'; then
echo "Installation of Nextcloud failed!"
touch "$NEXTCLOUD_DATA_DIR/install.failed"
exit 1
fi
# shellcheck disable=SC2016
installed_version="$(php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')"
INSTALLED_MAJOR="${installed_version%%.*}"
IMAGE_MAJOR="${image_version%%.*}"
if ! [ "$INSTALLED_MAJOR" -gt "$IMAGE_MAJOR" ]; then
php /var/www/html/occ config:system:set updater.release.channel --value=beta
php /var/www/html/occ config:system:set updatedirectory --value="/nc-updater"
php /var/www/html/updater/updater.phar --no-interaction
if ! php /var/www/html/occ -V || php /var/www/html/occ status | grep maintenance | grep -q 'true'; then
echo "Installation of Nextcloud failed!"
touch "$NEXTCLOUD_DATA_DIR/install.failed"
exit 1
fi
fi
php /var/www/html/occ config:system:set updater.release.channel --value=stable
php /var/www/html/occ db:add-missing-indices
php /var/www/html/occ db:add-missing-columns
php /var/www/html/occ db:add-missing-primary-keys
yes | php /var/www/html/occ db:convert-filecache-bigint
fi
# Apply log settings
echo "Applying default settings..."
@@ -235,6 +305,7 @@ if ! [ -f "$NEXTCLOUD_DATA_DIR/skip.update" ]; then
php /var/www/html/occ config:system:set enabledPreviewProviders 4 --value="OC\\Preview\\TXT"
php /var/www/html/occ config:system:set enabledPreviewProviders 5 --value="OC\\Preview\\OpenDocument"
php /var/www/html/occ config:system:set enabledPreviewProviders 6 --value="OC\\Preview\\Movie"
php /var/www/html/occ config:system:set enabledPreviewProviders 7 --value="OC\\Preview\\Krita"
php /var/www/html/occ config:system:set enable_previews --value=true --type=boolean
# Apply other settings
@@ -253,7 +324,19 @@ if ! [ -f "$NEXTCLOUD_DATA_DIR/skip.update" ]; then
if [ -n "$STARTUP_APPS" ]; then
read -ra STARTUP_APPS_ARRAY <<< "$STARTUP_APPS"
for app in "${STARTUP_APPS_ARRAY[@]}"; do
php /var/www/html/occ app:install "$app"
if ! echo "$app" | grep -q '^-'; then
if [ -z "$(find /var/www/html/apps -type d -maxdepth 1 -mindepth 1 -name "$app" )" ]; then
# If not shipped, install and enable the app
php /var/www/html/occ app:install "$app"
else
# If shipped, enable the app
php /var/www/html/occ app:enable "$app"
fi
else
app="${app#-}"
# Disable the app if '-' was provided in front of the appid
php /var/www/html/occ app:disable "$app"
fi
done
fi
@@ -280,8 +363,13 @@ if ! [ -f "$NEXTCLOUD_DATA_DIR/skip.update" ]; then
if [ "${APPSTORAGE[$app]}" != "no" ]; then
echo "Enabling $app..."
if ! php /var/www/html/occ app:enable "$app" >/dev/null; then
echo "$app could not get enabled. Probably because it is not compatible with the new Nextcloud version."
bash /notify.sh "Could not enable the $app after the Nextcloud update!" "Feel free to look at the Nextcloud update logs and force-enable the app again from the app-store UI."
echo "The $app app could not get enabled. Probably because it is not compatible with the new Nextcloud version."
if [ "$app" = apporder ]; then
CUSTOM_HINT="The apporder app was deprecated. A possible replacement is the side_menu app, aka 'Custom menu'."
else
CUSTOM_HINT="Most likely because it is not compatible with the new Nextcloud version."
fi
bash /notify.sh "Could not enable the $app app after the Nextcloud update!" "$CUSTOM_HINT Feel free to look at the Nextcloud update logs and force-enable the app again from the app-store UI."
continue
fi
# Only restore the group settings, if the app was enabled (and is thus compatible with the new NC version)
@@ -310,6 +398,8 @@ if ! [ -f "$NEXTCLOUD_DATA_DIR/skip.update" ]; then
# Performing update of all apps if daily backups are enabled, running and successful and if it is saturday
if [ "$UPDATE_NEXTCLOUD_APPS" = 'yes' ] && [ "$(date +%u)" = 6 ]; then
UPDATED_APPS="$(php /var/www/html/occ app:update --all)"
# Update all apps again and try to prevent something like https://github.com/nextcloud/polls/issues/2793 from happening
php /var/www/html/occ app:update --all
if [ -n "$UPDATED_APPS" ]; then
bash /notify.sh "Your apps just got updated!" "$UPDATED_APPS"
fi
@@ -318,18 +408,18 @@ else
SKIP_UPDATE=1
fi
# Check if appdata is present
# If not, something broke (e.g. changing ncdatadir after aio was first started)
if [ -z "$(find "$NEXTCLOUD_DATA_DIR/" -maxdepth 1 -mindepth 1 -type d -name "appdata_*")" ]; then
echo "Appdata is not present. Did you maybe change the datadir after aio was first started?"
echo "See https://github.com/nextcloud/all-in-one#how-to-change-the-default-location-of-nextclouds-datadir"
echo "In the datadir was found:"
ls -la "$NEXTCLOUD_DATA_DIR/"
exit 1
fi
# Configure tempdirectory
if [ -z "$OBJECTSTORE_S3_BUCKET" ] && [ -z "$OBJECTSTORE_SWIFT_URL" ]; then
# Check if appdata is present
# If not, something broke (e.g. changing ncdatadir after aio was first started)
if [ -z "$(find "$NEXTCLOUD_DATA_DIR/" -maxdepth 1 -mindepth 1 -type d -name "appdata_*")" ]; then
echo "Appdata is not present. Did you maybe change the datadir after aio was first started?"
echo "See https://github.com/nextcloud/all-in-one#how-to-change-the-default-location-of-nextclouds-datadir"
echo "In the datadir was found:"
ls -la "$NEXTCLOUD_DATA_DIR/"
exit 1
fi
# Configure tempdirectory
mkdir -p "$NEXTCLOUD_DATA_DIR/tmp/"
if ! grep -q upload_tmp_dir /usr/local/etc/php/conf.d/nextcloud.ini; then
echo "upload_tmp_dir = $NEXTCLOUD_DATA_DIR/tmp/" >> /usr/local/etc/php/conf.d/nextcloud.ini
@@ -354,6 +444,7 @@ php /var/www/html/occ app:enable support
echo "Adjusting log files..."
php /var/www/html/occ config:system:set logfile --value="/var/www/html/data/nextcloud.log"
php /var/www/html/occ config:app:set admin_audit logfile --value="/var/www/html/data/audit.log"
php /var/www/html/occ config:system:set updatedirectory --value="/nc-updater"
# Apply network settings
echo "Applying network settings..."
@@ -370,16 +461,14 @@ else
fi
# AIO app
if [ "$(php /var/www/html/occ config:app:get nextcloud-aio enabled)" = "" ]; then
php /var/www/html/occ app:enable nextcloud-aio
elif [ "$(php /var/www/html/occ config:app:get nextcloud-aio enabled)" = "no" ]; then
if [ "$(php /var/www/html/occ config:app:get nextcloud-aio enabled)" != "yes" ]; then
php /var/www/html/occ app:enable nextcloud-aio
fi
# Notify push
if ! [ -d "/var/www/html/custom_apps/notify_push" ]; then
php /var/www/html/occ app:install notify_push
elif [ "$(php /var/www/html/occ config:app:get notify_push enabled)" = "no" ]; then
elif [ "$(php /var/www/html/occ config:app:get notify_push enabled)" != "yes" ]; then
php /var/www/html/occ app:enable notify_push
elif [ "$SKIP_UPDATE" != 1 ]; then
php /var/www/html/occ app:update notify_push
@@ -392,7 +481,7 @@ php /var/www/html/occ config:app:set notify_push base_endpoint --value="https://
if [ "$COLLABORA_ENABLED" = 'yes' ]; then
if ! [ -d "/var/www/html/custom_apps/richdocuments" ]; then
php /var/www/html/occ app:install richdocuments
elif [ "$(php /var/www/html/occ config:app:get richdocuments enabled)" = "no" ]; then
elif [ "$(php /var/www/html/occ config:app:get richdocuments enabled)" != "yes" ]; then
php /var/www/html/occ app:enable richdocuments
elif [ "$SKIP_UPDATE" != 1 ]; then
php /var/www/html/occ app:update richdocuments
@@ -400,6 +489,44 @@ if [ "$COLLABORA_ENABLED" = 'yes' ]; then
php /var/www/html/occ config:app:set richdocuments wopi_url --value="https://$NC_DOMAIN/"
# Fix https://github.com/nextcloud/all-in-one/issues/188:
php /var/www/html/occ config:system:set allow_local_remote_servers --type=bool --value=true
# Make collabora more save
COLLABORA_IPv4_ADDRESS="$(echo "<?php echo gethostbyname('$NC_DOMAIN');" | php | head -1)"
COLLABORA_IPv6_ADDRESS="<?php \$record = dns_get_record('$NC_DOMAIN', DNS_AAAA);"
# shellcheck disable=SC2016
COLLABORA_IPv6_ADDRESS+='if (!empty($record)) {echo $record[0]["ipv6"];}'
COLLABORA_IPv6_ADDRESS="$(echo "$COLLABORA_IPv6_ADDRESS" | php | head -1)"
COLLABORA_ALLOW_LIST="$(php /var/www/html/occ config:app:get richdocuments wopi_allowlist)"
if [ -n "$COLLABORA_IPv4_ADDRESS" ]; then
if ! echo "$COLLABORA_ALLOW_LIST" | grep -q "$COLLABORA_IPv4_ADDRESS"; then
if [ -z "$COLLABORA_ALLOW_LIST" ]; then
COLLABORA_ALLOW_LIST="$COLLABORA_IPv4_ADDRESS"
else
COLLABORA_ALLOW_LIST+=",$COLLABORA_IPv4_ADDRESS"
fi
fi
else
echo "Warning: No ipv4-address found for $NC_DOMAIN."
fi
if [ -n "$COLLABORA_IPv6_ADDRESS" ]; then
if ! echo "$COLLABORA_ALLOW_LIST" | grep -q "$COLLABORA_IPv6_ADDRESS"; then
if [ -z "$COLLABORA_ALLOW_LIST" ]; then
COLLABORA_ALLOW_LIST="$COLLABORA_IPv6_ADDRESS"
else
COLLABORA_ALLOW_LIST+=",$COLLABORA_IPv6_ADDRESS"
fi
fi
else
echo "No ipv6-address found for $NC_DOMAIN."
fi
if [ -n "$COLLABORA_ALLOW_LIST" ]; then
PRIVATE_IP_RANGES='127.0.0.1/8,192.168.0.0/16,172.16.0.0/12,10.0.0.0/8,fd00::/8,::1'
if ! echo "$COLLABORA_ALLOW_LIST" | grep -q "$PRIVATE_IP_RANGES"; then
COLLABORA_ALLOW_LIST+=",$PRIVATE_IP_RANGES"
fi
php /var/www/html/occ config:app:set richdocuments wopi_allowlist --value="$COLLABORA_ALLOW_LIST"
else
echo "Warning: wopi_allowlist is empty which should not be the case!"
fi
else
if [ -d "/var/www/html/custom_apps/richdocuments" ]; then
php /var/www/html/occ app:remove richdocuments
@@ -414,7 +541,7 @@ if [ "$ONLYOFFICE_ENABLED" = 'yes' ]; then
done
if ! [ -d "/var/www/html/custom_apps/onlyoffice" ]; then
php /var/www/html/occ app:install onlyoffice
elif [ "$(php /var/www/html/occ config:app:get onlyoffice enabled)" = "no" ]; then
elif [ "$(php /var/www/html/occ config:app:get onlyoffice enabled)" != "yes" ]; then
php /var/www/html/occ app:enable onlyoffice
elif [ "$SKIP_UPDATE" != 1 ]; then
php /var/www/html/occ app:update onlyoffice
@@ -433,16 +560,17 @@ fi
if [ "$TALK_ENABLED" = 'yes' ]; then
if ! [ -d "/var/www/html/custom_apps/spreed" ]; then
php /var/www/html/occ app:install spreed
elif [ "$(php /var/www/html/occ config:app:get spreed enabled)" = "no" ]; then
elif [ "$(php /var/www/html/occ config:app:get spreed enabled)" != "yes" ]; then
php /var/www/html/occ app:enable spreed
elif [ "$SKIP_UPDATE" != 1 ]; then
php /var/www/html/occ app:update spreed
fi
# Based on https://github.com/nextcloud/spreed/issues/960#issuecomment-416993435
if [ -z "$(php /var/www/html/occ talk:turn:list --output="plain")" ]; then
php /var/www/html/occ talk:turn:add "$NC_DOMAIN:$TALK_PORT" "udp,tcp" --secret="$TURN_SECRET"
php /var/www/html/occ talk:turn:add turn "$NC_DOMAIN:$TALK_PORT" "udp,tcp" --secret="$TURN_SECRET"
fi
if php /var/www/html/occ talk:stun:list --output="plain" | grep -oP '[a-zA-Z.:0-9]+' | grep -q "^stun.nextcloud.com:443$"; then
STUN_SERVER="$(php /var/www/html/occ talk:stun:list --output="plain")"
if [ -z "$STUN_SERVER" ] || echo "$STUN_SERVER" | grep -oP '[a-zA-Z.:0-9]+' | grep -q "^stun.nextcloud.com:443$"; then
php /var/www/html/occ talk:stun:add "$NC_DOMAIN:$TALK_PORT"
php /var/www/html/occ talk:stun:delete "stun.nextcloud.com:443"
fi
@@ -457,23 +585,30 @@ fi
# Clamav
if [ "$CLAMAV_ENABLED" = 'yes' ]; then
while ! nc -z "$CLAMAV_HOST" 3310; do
count=0
while ! nc -z "$CLAMAV_HOST" 3310 && [ "$count" -lt 90 ]; do
echo "waiting for clamav to become available..."
count=$((count+5))
sleep 5
done
if ! [ -d "/var/www/html/custom_apps/files_antivirus" ]; then
php /var/www/html/occ app:install files_antivirus
elif [ "$(php /var/www/html/occ config:app:get files_antivirus enabled)" = "no" ]; then
php /var/www/html/occ app:enable files_antivirus
elif [ "$SKIP_UPDATE" != 1 ]; then
php /var/www/html/occ app:update files_antivirus
if [ "$count" -ge 90 ]; then
echo "Clamav did not start in time. Skipping initialization and disabling files_antivirus app."
php /var/www/html/occ app:disable files_antivirus
else
if ! [ -d "/var/www/html/custom_apps/files_antivirus" ]; then
php /var/www/html/occ app:install files_antivirus
elif [ "$(php /var/www/html/occ config:app:get files_antivirus enabled)" != "yes" ]; then
php /var/www/html/occ app:enable files_antivirus
elif [ "$SKIP_UPDATE" != 1 ]; then
php /var/www/html/occ app:update files_antivirus
fi
php /var/www/html/occ config:app:set files_antivirus av_mode --value="daemon"
php /var/www/html/occ config:app:set files_antivirus av_port --value="3310"
php /var/www/html/occ config:app:set files_antivirus av_host --value="$CLAMAV_HOST"
php /var/www/html/occ config:app:set files_antivirus av_stream_max_length --value="104857600"
php /var/www/html/occ config:app:set files_antivirus av_max_file_size --value="-1"
php /var/www/html/occ config:app:set files_antivirus av_infected_action --value="only_log"
fi
php /var/www/html/occ config:app:set files_antivirus av_mode --value="daemon"
php /var/www/html/occ config:app:set files_antivirus av_port --value="3310"
php /var/www/html/occ config:app:set files_antivirus av_host --value="$CLAMAV_HOST"
php /var/www/html/occ config:app:set files_antivirus av_stream_max_length --value="104857600"
php /var/www/html/occ config:app:set files_antivirus av_max_file_size --value="-1"
php /var/www/html/occ config:app:set files_antivirus av_infected_action --value="only_log"
else
if [ -d "/var/www/html/custom_apps/files_antivirus" ]; then
php /var/www/html/occ app:remove files_antivirus
@@ -486,8 +621,13 @@ if version_greater "$installed_version" "24.0.0.0"; 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"
else
php /var/www/html/occ config:system:delete enabledPreviewProviders 0
php /var/www/html/occ config:system:delete preview_imaginary_url
if [ -n "$(php /var/www/html/occ config:system:get preview_imaginary_url)" ]; then
php /var/www/html/occ config:system:delete enabledPreviewProviders 0
php /var/www/html/occ config:system:delete preview_imaginary_url
php /var/www/html/occ config:system:delete enabledPreviewProviders 20
php /var/www/html/occ config:system:delete enabledPreviewProviders 21
php /var/www/html/occ config:system:delete enabledPreviewProviders 22
fi
fi
fi
@@ -499,21 +639,21 @@ if [ "$FULLTEXTSEARCH_ENABLED" = 'yes' ]; then
done
if ! [ -d "/var/www/html/custom_apps/fulltextsearch" ]; then
php /var/www/html/occ app:install fulltextsearch
elif [ "$(php /var/www/html/occ config:app:get fulltextsearch enabled)" = "no" ]; then
elif [ "$(php /var/www/html/occ config:app:get fulltextsearch enabled)" != "yes" ]; then
php /var/www/html/occ app:enable fulltextsearch
elif [ "$SKIP_UPDATE" != 1 ]; then
php /var/www/html/occ app:update fulltextsearch
fi
if ! [ -d "/var/www/html/custom_apps/fulltextsearch_elasticsearch" ]; then
php /var/www/html/occ app:install fulltextsearch_elasticsearch
elif [ "$(php /var/www/html/occ config:app:get fulltextsearch_elasticsearch enabled)" = "no" ]; then
elif [ "$(php /var/www/html/occ config:app:get fulltextsearch_elasticsearch enabled)" != "yes" ]; then
php /var/www/html/occ app:enable fulltextsearch_elasticsearch
elif [ "$SKIP_UPDATE" != 1 ]; then
php /var/www/html/occ app:update fulltextsearch_elasticsearch
fi
if ! [ -d "/var/www/html/custom_apps/files_fulltextsearch" ]; then
php /var/www/html/occ app:install files_fulltextsearch
elif [ "$(php /var/www/html/occ config:app:get files_fulltextsearch enabled)" = "no" ]; then
elif [ "$(php /var/www/html/occ config:app:get files_fulltextsearch enabled)" != "yes" ]; then
php /var/www/html/occ app:enable files_fulltextsearch
elif [ "$SKIP_UPDATE" != 1 ]; then
php /var/www/html/occ app:update files_fulltextsearch
@@ -527,10 +667,11 @@ if [ "$FULLTEXTSEARCH_ENABLED" = 'yes' ]; then
echo "Waiting 10s before activating FTS..."
sleep 10
echo "Activating fulltextsearch..."
if php /var/www/html/occ fulltextsearch:test && php /var/www/html/occ fulltextsearch:index; then
if php /var/www/html/occ fulltextsearch:test && php /var/www/html/occ fulltextsearch:index "{\"errors\": \"reset\"}" --no-readline; then
touch "$NEXTCLOUD_DATA_DIR/fts-index.done"
else
echo "Fulltextsearch failed. Could not index."
echo "Feel free to follow https://github.com/nextcloud/all-in-one/discussions/1709 if you want to skip the indexing in the future."
fi
fi
else

View File

@@ -0,0 +1,7 @@
#!/bin/bash
nc -z "$POSTGRES_HOST" 5432 || exit 0
if ! nc -z localhost 9000 || ! nc -z localhost 7867; then
exit 1
fi

View File

@@ -17,10 +17,11 @@ if [ -f "/var/www/html/config/config.php" ]; then
echo "Waiting for the database to start..."
sleep 5
done
if [ "$POSTGRES_USER" = "oc_nextcloud" ] && echo "$POSTGRES_PASSWORD" | grep -q '^[a-z0-9]\+$'; then
# this was introduced with https://github.com/nextcloud/all-in-one/pull/218
if [ "$POSTGRES_USER" = "oc_nextcloud" ] && [ "$POSTGRES_DB" = "nextcloud_database" ] && echo "$POSTGRES_PASSWORD" | grep -q '^[a-z0-9]\+$'; then
# This was introduced with https://github.com/nextcloud/all-in-one/pull/218
sed -i "s|'dbuser'.*=>.*$|'dbuser' => '$POSTGRES_USER',|" /var/www/html/config/config.php
sed -i "s|'dbpassword'.*=>.*$|'dbpassword' => '$POSTGRES_PASSWORD',|" /var/www/html/config/config.php
sed -i "s|'db_name'.*=>.*$|'db_name' => '$POSTGRES_DB',|" /var/www/html/config/config.php
fi
fi
@@ -30,6 +31,18 @@ if [ -n "$TRUSTED_CACERTS_DIR" ]; then
update-ca-certificates
fi
# Check if /dev/dri device is present and apply correct permissions
set -x
if ! [ -f "/dev-dri-group-was-added" ] && [ -n "$(find /dev -maxdepth 1 -mindepth 1 -name dri)" ] && [ -n "$(find /dev/dri -maxdepth 1 -mindepth 1 -name renderD128)" ]; then
# From https://github.com/pulsejet/memories/wiki/QSV-Transcoding#docker-installations
GID="$(stat -c "%g" /dev/dri/renderD128)"
groupadd -g "$GID" render2 || true # sometimes this is needed
GROUP="$(getent group "$GID" | cut -d: -f1)"
usermod -aG "$GROUP" www-data
touch "/dev-dri-group-was-added"
fi
set +x
# Check datadir permissions
sudo -u www-data touch "$NEXTCLOUD_DATA_DIR/this-is-a-test-file" &>/dev/null
if ! [ -f "$NEXTCLOUD_DATA_DIR/this-is-a-test-file" ]; then
@@ -57,21 +70,25 @@ if [ -n "$ADDITIONAL_PHP_EXTENSIONS" ]; then
if ! [ -f "/additional-php-extensions-are-installed" ]; then
read -ra ADDITIONAL_PHP_EXTENSIONS_ARRAY <<< "$ADDITIONAL_PHP_EXTENSIONS"
for app in "${ADDITIONAL_PHP_EXTENSIONS_ARRAY[@]}"; do
if [ "$app" = imagick ]; then
echo "Enabling Imagick..."
if ! docker-php-ext-enable imagick >/dev/null; then
echo "Could not install PHP extension imagick!"
fi
continue
fi
# shellcheck disable=SC2086
if [ "$PHP_DEPS_ARE_INSTALLED" != 1 ]; then
echo "Installing PHP build dependencies..."
if ! apk add --no-cache --virtual .build-deps libxml2-dev imagemagick-dev autoconf $PHPIZE_DEPS >/dev/null; then
if ! apk add --no-cache --virtual .build-deps \
libxml2-dev \
autoconf \
$PHPIZE_DEPS >/dev/null; then
echo "Could not install build-deps!"
fi
PHP_DEPS_ARE_INSTALLED=1
fi
if [ "$app" = imagick ]; then
echo "Installing Imagick via PECL..."
pecl install imagick-3.7.0 >/dev/null
if ! docker-php-ext-enable imagick >/dev/null; then
echo "Could not install PHP extension imagick!"
fi
elif [ "$app" = inotify ]; then
if [ "$app" = inotify ]; then
echo "Installing $app via PECL..."
pecl install "$app" >/dev/null
if ! docker-php-ext-enable "$app" >/dev/null; then

View File

@@ -1,4 +1,5 @@
# From https://github.com/ONLYOFFICE/Docker-DocumentServer/blob/master/Dockerfile
FROM onlyoffice/documentserver:7.2.1.34
FROM onlyoffice/documentserver:7.3.3.50
HEALTHCHECK CMD curl -skfI localhost || exit 1
HEALTHCHECK CMD nc -z localhost 80 || exit 1
LABEL com.centurylinklabs.watchtower.monitor-only="true"

View File

@@ -1,35 +1,35 @@
# From https://github.com/docker-library/postgres/blob/master/13/alpine/Dockerfile
FROM postgres:14.6-alpine
# From https://github.com/docker-library/postgres/blob/master/15/alpine/Dockerfile
FROM postgres:15.3-alpine
RUN apk add --update --no-cache bash openssl shadow netcat-openbsd grep mawk
COPY --chmod=775 start.sh /start.sh
COPY --chmod=775 healthcheck.sh /healthcheck.sh
COPY --chmod=775 init-user-db.sh /docker-entrypoint-initdb.d/init-user-db.sh
# We need to use the same gid and uid as on old installations
RUN set -ex; \
apk add --no-cache bash openssl shadow grep mawk; \
\
# We need to use the same gid and uid as on old installations
deluser postgres; \
groupmod -g 9999 ping; \
addgroup -g 999 -S postgres; \
adduser -u 999 -S -D -G postgres -H -h /var/lib/postgresql -s /bin/sh postgres
adduser -u 999 -S -D -G postgres -H -h /var/lib/postgresql -s /bin/sh postgres; \
apk del --no-cache shadow; \
\
# Fix default permissions
RUN set -ex; \
chown -R postgres:postgres /var/lib/postgresql; \
chown -R postgres:postgres /var/run/postgresql; \
chown -R postgres:postgres "$PGDATA"
COPY start.sh /usr/bin/
COPY init-user-db.sh /docker-entrypoint-initdb.d/
RUN chmod +x /usr/bin/start.sh; \
chmod +xr /docker-entrypoint-initdb.d/init-user-db.sh
RUN mkdir /mnt/data; \
chown postgres:postgres /mnt/data;
chown -R postgres:postgres "$PGDATA"; \
\
mkdir /mnt/data; \
chown postgres:postgres /mnt/data; \
\
# Give root a random password
echo "root:$(openssl rand -base64 12)" | chpasswd
VOLUME /mnt/data
# Give root a random password
RUN echo "root:$(openssl rand -base64 12)" | chpasswd
USER postgres
ENTRYPOINT ["start.sh"]
ENTRYPOINT ["/start.sh"]
HEALTHCHECK CMD psql -d "postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@localhost:5432/$POSTGRES_DB" -c "select now()" || exit 1
HEALTHCHECK CMD /healthcheck.sh
LABEL com.centurylinklabs.watchtower.monitor-only="true"

View File

@@ -0,0 +1,5 @@
#!/bin/bash
test -f "/mnt/data/backup-is-running" && exit 0
psql -d "postgresql://oc_$POSTGRES_USER:$POSTGRES_PASSWORD@localhost:5432/$POSTGRES_DB" -c "select now()" || exit 1

View File

@@ -1,9 +1,15 @@
#!/bin/bash
set -ex
touch "$DUMP_DIR/initialization.failed"
psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
CREATE USER "oc_$POSTGRES_USER" WITH PASSWORD '$POSTGRES_PASSWORD' CREATEDB;
ALTER DATABASE "$POSTGRES_DB" OWNER TO "oc_$POSTGRES_USER";
GRANT ALL PRIVILEGES ON DATABASE "$POSTGRES_DB" TO "oc_$POSTGRES_USER";
GRANT ALL PRIVILEGES ON SCHEMA public TO "oc_$POSTGRES_USER";
EOSQL
rm "$DUMP_DIR/initialization.failed"
set +ex

View File

@@ -2,15 +2,15 @@
# Variables
DATADIR="/var/lib/postgresql/data"
DUMP_DIR="/mnt/data"
export DUMP_DIR="/mnt/data"
DUMP_FILE="$DUMP_DIR/database-dump.sql"
export PGPASSWORD="$POSTGRES_PASSWORD"
# Don't start database as long as backup is running
while [ -f "$DUMP_DIR/backup-is-running" ]; do
echo "Waiting for backup container to finish..."
echo "If this is incorrect because the backup container is not running anymore (because it was forcefully killed), you might delete the lock file which is by default stored here:"
echo "/var/lib/docker/volumes/nextcloud_aio_database_dump/_data/backup-is-running"
echo "If this is incorrect because the backup container is not running anymore (because it was forcefully killed), you might delete the lock file:"
echo "sudo docker exec --user root nextcloud-aio-database rm /mnt/data/backup-is-running"
sleep 10
done
@@ -20,6 +20,23 @@ if ! [ -w "$DUMP_DIR" ]; then
exit 1
fi
# Don't start if import failed
if [ -f "$DUMP_DIR/import.failed" ]; then
echo "The database import failed. Please restore a backup and try again."
echo "For further clues on what went wrong, look at the logs above."
exit 1
fi
# Don't start if initialization failed
if [ -f "$DUMP_DIR/initialization.failed" ]; then
echo "The database initialization failed. Most likely was a wrong timezone selected."
echo "The selected timezone is '$TZ'."
echo "Please check if it is in 'TZ database name' column of the timezone list: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List"
echo "For further clues on what went wrong, look at the logs above."
echo "You might start again from scratch by following https://github.com/nextcloud/all-in-one#how-to-properly-reset-the-instance and selecting a proper timezone."
exit 1
fi
# Delete the datadir once (needed for setting the correct credentials on old instances once)
if ! [ -f "$DUMP_DIR/export.failed" ] && ! [ -f "$DUMP_DIR/initial-cleanup-done" ]; then
set -ex
@@ -45,9 +62,16 @@ if ( [ -f "$DATADIR/PG_VERSION" ] && [ "$PG_MAJOR" != "$(cat "$DATADIR/PG_VERSIO
exit 1
fi
# Write output to logfile.
exec > >(tee -i "$DUMP_DIR/database-import.log")
exec 2>&1
# Inform
echo "Restoring from database dump."
# Add import.failed file
touch "$DUMP_DIR/import.failed"
# Exit if any command fails
set -ex
@@ -61,7 +85,7 @@ if ( [ -f "$DATADIR/PG_VERSION" ] && [ "$PG_MAJOR" != "$(cat "$DATADIR/PG_VERSIO
exec docker-entrypoint.sh postgres &
# Wait for creation
while ! nc -z localhost 11000; do
while ! psql -d "postgresql://oc_$POSTGRES_USER:$POSTGRES_PASSWORD@localhost:11000/$POSTGRES_DB" -c "select now()"; do
echo "Waiting for the database to start."
sleep 5
done
@@ -76,11 +100,18 @@ if ( [ -f "$DATADIR/PG_VERSION" ] && [ "$PG_MAJOR" != "$(cat "$DATADIR/PG_VERSIO
# Get the Owner
DB_OWNER="$(grep "$GREP_STRING" "$DUMP_FILE" | grep -oP 'Owner:.*$' | sed 's|Owner:||;s| ||g')"
if [ "$DB_OWNER" != "oc_$POSTGRES_USER" ]; then
if [ "$DB_OWNER" = "$POSTGRES_USER" ]; then
echo "Unfortunately was the found database owner of the dump file the same as the POSTGRES_USER $POSTGRES_USER"
echo "It is not possible to import a database dump from this database owner."
echo "However you might rename the owner in the dumpfile to something else."
exit 1
elif [ "$DB_OWNER" != "oc_$POSTGRES_USER" ]; then
DIFFERENT_DB_OWNER=1
psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
CREATE USER "$DB_OWNER" WITH PASSWORD '$POSTGRES_PASSWORD' CREATEDB;
ALTER DATABASE "$POSTGRES_DB" OWNER TO "$DB_OWNER";
GRANT ALL PRIVILEGES ON DATABASE "$POSTGRES_DB" TO "$DB_OWNER";
GRANT ALL PRIVILEGES ON SCHEMA public TO "$DB_OWNER";
EOSQL
fi
@@ -104,6 +135,9 @@ EOSQL
# Don't exit if command fails anymore
set +ex
# Remove import failed file if everything went correctly
rm "$DUMP_DIR/import.failed"
fi
# Cover the last case

View File

@@ -1,15 +1,16 @@
# From https://github.com/docker-library/redis/blob/master/6.2/alpine/Dockerfile
FROM redis:6.2.7-alpine
# From https://github.com/docker-library/redis/blob/master/7.0/alpine/Dockerfile
FROM redis:7.0.11-alpine
RUN apk add --update --no-cache openssl bash
COPY start.sh /usr/bin/
RUN chmod +x /usr/bin/start.sh
COPY --chmod=775 start.sh /usr/bin/start.sh
RUN set -ex; \
apk add --no-cache openssl bash; \
\
# Give root a random password
RUN echo "root:$(openssl rand -base64 12)" | chpasswd
echo "root:$(openssl rand -base64 12)" | chpasswd
USER redis
ENTRYPOINT ["start.sh"]
HEALTHCHECK CMD redis-cli -a $REDIS_HOST_PASSWORD PING || exit 1
HEALTHCHECK CMD redis-cli -a $REDIS_HOST_PASSWORD PING || exit 1
LABEL com.centurylinklabs.watchtower.monitor-only="true"

View File

@@ -1,5 +1,11 @@
#!/bin/bash
# Show wiki if vm.overcommit is disabled
if [ "$(sysctl -n vm.overcommit_memory)" != "1" ]; then
echo "Memory overcommit is disabled but necessary for safe operation"
echo "See https://github.com/nextcloud/all-in-one/discussions/1731 how to enable overcommit"
fi
# Run redis with a password if provided
if [ -n "$REDIS_HOST_PASSWORD" ]; then
exec redis-server --requirepass "$REDIS_HOST_PASSWORD"

View File

@@ -1,66 +1,62 @@
FROM ubuntu:focal-20221019
FROM nats:2.9.16-scratch as nats
FROM strukturag/nextcloud-spreed-signaling:1.1.2 as signaling
FROM coturn/coturn:4.6.2-r0-alpine
USER root
COPY --from=nats /nats-server /usr/local/bin/nats-server
COPY --from=signaling /usr/bin/nextcloud-spreed-signaling /usr/local/bin/nextcloud-spreed-signaling
COPY --chmod=775 start.sh /usr/bin/start.sh
COPY --chmod=664 supervisord.conf /supervisord.conf
RUN set -ex; \
\
apt-get update; \
apt-get install -y --no-install-recommends \
openssl \
coturn \
supervisor \
curl \
apk add --no-cache \
ca-certificates \
netcat \
; \
rm -rf /var/lib/apt/lists/*
RUN set -ex; \
curl -sL -o "/etc/apt/trusted.gpg.d/morph027-nats-server.asc" "https://packaging.gitlab.io/nats-server/gpg.key"; \
echo "deb https://packaging.gitlab.io/nats-server nats main" > /etc/apt/sources.list.d/morph027-nats-server.list; \
. /etc/lsb-release; \
curl -sL -o "/etc/apt/trusted.gpg.d/morph027-janus.asc" "https://packaging.gitlab.io/janus/gpg.key"; \
echo "deb https://packaging.gitlab.io/janus/$DISTRIB_CODENAME $DISTRIB_CODENAME main" > /etc/apt/sources.list.d/morph027-janus.list; \
curl -sL -o "/etc/apt/trusted.gpg.d/morph027-nextcloud-spreed-signaling.asc" "https://packaging.gitlab.io/nextcloud-spreed-signaling/gpg.key"; \
echo "deb https://packaging.gitlab.io/nextcloud-spreed-signaling signaling main" > /etc/apt/sources.list.d/morph027-nextcloud-spreed-signaling.list
RUN set -ex; \
tzdata \
bash \
openssl \
supervisor \
bind-tools \
netcat-openbsd \
shadow \
util-linux \
build-base \
lua5.3-dev \
luarocks5.3; \
apk add --no-cache janus-gateway --repository http://dl-cdn.alpinelinux.org/alpine/edge/community; \
useradd --system talk; \
luarocks-5.3 install luajson; \
luarocks-5.3 install ansicolors; \
rename -v ".jcfg.sample" ".jcfg" /etc/janus/*.sample; \
apk del --no-cache \
shadow \
util-linux \
build-base \
lua5.3-dev \
luarocks5.3; \
\
apt-get update; \
apt-get install -y --no-install-recommends \
nats-server \
janus \
nextcloud-spreed-signaling \
; \
rm -rf /var/lib/apt/lists/*
RUN adduser --system --group talk
RUN mkdir /var/log/supervisord; \
mkdir /var/run/supervisord; \
chown talk:talk /var/run/supervisord; \
chown talk:talk /var/log/supervisord;
COPY start.sh /usr/bin/
COPY supervisord.conf /
RUN chmod +x /usr/bin/start.sh; \
chmod +r /supervisord.conf; \
touch /etc/turnserver.conf; \
chown talk:talk /etc/turnserver.conf; \
sed -i '/TURNSERVER_ENABLED/c\TURNSERVER_ENABLED=1' /etc/default/coturn; \
mkdir -p /var/tmp;
RUN curl -sL -o "/usr/share/janus/lua/json.lua" "https://raw.githubusercontent.com/rxi/json.lua/master/json.lua"; \
curl -sL -o "/usr/share/janus/lua/ansicolors.lua" "https://raw.githubusercontent.com/kikito/ansicolors.lua/master/ansicolors.lua"
RUN mkdir -p /etc/nats; \
echo "listen: 127.0.0.1:4222" > /etc/nats/nats.conf; \
chown talk:talk /etc; \
chown talk:talk -R /etc/nats; \
chown talk:talk -R /etc/janus; \
chown talk:talk -R /etc/signaling; \
chown talk:talk -R /usr
# Give root a random password
RUN echo "root:$(openssl rand -base64 12)" | chpasswd
echo "root:$(openssl rand -base64 12)" | chpasswd; \
\
touch \
/etc/nats.conf \
/etc/signaling.conf \
/etc/turnserver.conf; \
echo "listen: 127.0.0.1:4222" | tee /etc/nats.conf; \
mkdir -p \
/var/tmp \
/var/lib/turn \
/var/log/supervisord \
/var/run/supervisord; \
chown talk:talk -R \
/usr \
/etc/janus \
/etc/nats.conf \
/etc/signaling.conf \
/etc/turnserver.conf \
/var/lib/turn \
/var/log/supervisord \
/var/run/supervisord;
# Set default talk port https://github.com/nextcloud/all-in-one/issues/1011
ENV TALK_PORT=3478
@@ -69,4 +65,5 @@ USER talk
ENTRYPOINT ["start.sh"]
CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]
HEALTHCHECK CMD (nc -z localhost 8081 && nc -z localhost 8188 && nc -z localhost 4222 && nc -z localhost $TALK_PORT) || exit 1
HEALTHCHECK CMD (nc -z localhost 8081 && nc -z localhost 8188 && nc -z localhost 4222 && nc -z localhost "$TALK_PORT" && nc -z "$NC_DOMAIN" "$TALK_PORT") || exit 1
LABEL com.centurylinklabs.watchtower.monitor-only="true"

View File

@@ -7,19 +7,19 @@ if [ -z "$NC_DOMAIN" ]; then
elif [ -z "$TURN_SECRET" ]; then
echo "You need to provide the TURN_SECRET."
exit 1
elif [ -z "$JANUS_API_KEY" ]; then
echo "You need to provide the JANUS_API_KEY."
exit 1
elif [ -z "$SIGNALING_SECRET" ]; then
echo "You need to provide the SIGNALING_SECRET."
exit 1
fi
set -x
IPv4_ADDRESS_TALK="$(dig nextcloud-aio-talk A +short)"
set +x
# Turn
cat << TURN_CONF > "/etc/turnserver.conf"
listening-port=$TALK_PORT
fingerprint
lt-cred-mech
use-auth-secret
static-auth-secret=$TURN_SECRET
realm=$NC_DOMAIN
@@ -29,26 +29,29 @@ stale-nonce
no-multicast-peers
simple-log
pidfile=/var/tmp/turnserver.pid
no-tls
no-dtls
userdb=/var/lib/turn/turndb
# Based on https://nextcloud-talk.readthedocs.io/en/latest/TURN/#turn-server-and-internal-networks
allowed-peer-ip=$IPv4_ADDRESS_TALK
denied-peer-ip=0.0.0.0-0.255.255.255
denied-peer-ip=10.0.0.0-10.255.255.255
denied-peer-ip=100.64.0.0-100.127.255.255
denied-peer-ip=127.0.0.0-127.255.255.255
denied-peer-ip=169.254.0.0-169.254.255.255
denied-peer-ip=172.16.0.0-172.31.255.255
denied-peer-ip=192.0.0.0-192.0.0.255
denied-peer-ip=192.0.2.0-192.0.2.255
denied-peer-ip=192.88.99.0-192.88.99.255
denied-peer-ip=192.168.0.0-192.168.255.255
denied-peer-ip=198.18.0.0-198.19.255.255
denied-peer-ip=198.51.100.0-198.51.100.255
denied-peer-ip=203.0.113.0-203.0.113.255
denied-peer-ip=240.0.0.0-255.255.255.255
TURN_CONF
# Janus
set -x
sed -i "s|#turn_rest_api_key.*|turn_rest_api_key = \"$JANUS_API_KEY\"|" /etc/janus/janus.jcfg
sed -i "s|#full_trickle.*|full_trickle = true|g" /etc/janus/janus.jcfg
sed -i 's|#stun_server.*|stun_server = "127.0.0.1"|g' /etc/janus/janus.jcfg
sed -i "s|#stun_port.*|stun_port = $TALK_PORT|g" /etc/janus/janus.jcfg
sed -i "s|#turn_port.*|turn_port = $TALK_PORT|g" /etc/janus/janus.jcfg
sed -i 's|#turn_server.*|turn_server = "127.0.0.1"|g' /etc/janus/janus.jcfg
sed -i 's|#turn_type .*|turn_type = "udp"|g' /etc/janus/janus.jcfg
sed -i 's|#ice_ignore_list .*|ice_ignore_list = "udp"|g' /etc/janus/janus.jcfg
sed -i 's|#interface.*|interface = "lo"|g' /etc/janus/janus.transport.websockets.jcfg
sed -i 's|#ws_interface.*|ws_interface = "lo"|g' /etc/janus/janus.transport.websockets.jcfg
sed -i 's|certfile =|#certfile =|g' /etc/janus/janus.transport.mqtt.jcfg
sed -i 's|keyfile =|#keyfile =|g' /etc/janus/janus.transport.mqtt.jcfg
set +x
# Signling
cat << SIGNALING_CONF > "/etc/signaling/server.conf"
cat << SIGNALING_CONF > "/etc/signaling.conf"
[http]
listen = 0.0.0.0:8081
@@ -78,11 +81,6 @@ url = nats://127.0.0.1:4222
[mcu]
type = janus
url = ws://127.0.0.1:8188
[turn]
apikey = ${JANUS_API_KEY}
secret = ${TURN_SECRET}
servers = turn:$NC_DOMAIN:$TALK_PORT?transport=tcp,turn:$NC_DOMAIN:$TALK_PORT?transport=udp
SIGNALING_CONF
exec "$@"

View File

@@ -13,25 +13,25 @@ stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
command=turnserver
command=turnserver -c /etc/turnserver.conf
[program:nats-server]
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
command=nats-server -c /etc/nats/nats.conf
command=nats-server -c /etc/nats.conf
[program:janus]
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
command=/usr/bin/janus --config=/etc/janus/janus.jcfg --disable-colors --log-stdout
command=janus --config=/etc/janus/janus.jcfg --disable-colors --log-stdout
[program:signaling]
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
command=signaling --config /etc/signaling/server.conf
command=nextcloud-spreed-signaling -config /etc/signaling.conf

View File

@@ -1,13 +1,12 @@
# From https://github.com/containrrr/watchtower/blob/main/dockerfiles/Dockerfile.self-contained
FROM containrrr/watchtower:1.5.1 as watchtower
FROM containrrr/watchtower:1.5.3 as watchtower
FROM alpine:3.16.3
FROM alpine:3.17.3
RUN apk add --update --no-cache bash
COPY --from=watchtower /watchtower /
RUN apk add --no-cache bash
COPY --from=watchtower /watchtower /watchtower
COPY start.sh /
RUN chmod +x /start.sh
COPY --chmod=775 start.sh /start.sh
USER root
ENTRYPOINT ["/start.sh"]
LABEL com.centurylinklabs.watchtower.monitor-only="true"

View File

@@ -2,10 +2,10 @@
<info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
<id>nextcloud-aio</id>
<name>Nextcloud All In One</name>
<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.2.0</version>
<description>Add a link to the admin settings that gives access to the Nextcloud All-in-One admin interface</description>
<version>0.3.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="23" max-version="24"/>
<nextcloud min-version="24" max-version="25"/>
</dependencies>
<settings>

View File

@@ -10,6 +10,7 @@ declare(strict_types=1);
*/
/** @var array $_ */ ?>
<div id="allinone" class="section">
<h2><?php p($l->t('Nextcloud All In One'));?></h2>
<a href="<?php p($_['AIOLoginUrl']);?>" class="button" target="_blank" rel="noopener">Open Nextcloud AIO Interface ↗</a>
<h2><?php p($l->t('Nextcloud All-in-One'));?></h2>
<a href="<?php p($_['AIOLoginUrl']);?>" class="button" target="_blank" rel="noopener">Open Nextcloud AIO Interface ↗</a><br><br>
<p><a href="https://github.com/nextcloud/all-in-one#how-to-easily-log-in-to-the-aio-interface">Click here for more infos on this feature (e.g. also on how to change the link in the button)</a></p>
</div>

View File

@@ -22,6 +22,8 @@ Simply use https://github.com/nextcloud/all-in-one/issues/180 as template.
Go to https://github.com/nextcloud-releases/all-in-one/actions/workflows/repo-sync.yml and run the workflow that will first sync the repo and then build new container that automatically get published to `develop` and `develop-arm64`.
## How to test things correctly?
Before testing, make sure that at least the amd64 containers are built successfully by checking the last workflow here: https://github.com/nextcloud-releases/all-in-one/actions/workflows/build_images.yml.
There is a testing-VM available for the maintainer of AIO that allows for some final testing before releasing new version. See [this](https://cloud.nextcloud.com/apps/collectives/Nextcloud%20Handbook/Technical/AIO%20testing%20VM?fileId=6350152) for details.
## How to promote builds from develop to beta

View File

@@ -2,36 +2,39 @@ version: "3.8"
volumes:
nextcloud_aio_mastercontainer:
name: nextcloud_aio_mastercontainer # This line is not allowed to be changed
name: nextcloud_aio_mastercontainer # This line is not allowed to be changed as otherwise the built-in backup solution will not work
services:
nextcloud:
image: nextcloud/all-in-one:latest # Must be changed to 'nextcloud/all-in-one:latest-arm64' when used with an arm64 CPU
image: nextcloud/all-in-one:latest
restart: always
container_name: nextcloud-aio-mastercontainer # This line is not allowed to be changed
container_name: nextcloud-aio-mastercontainer # This line is not allowed to be changed as otherwise AIO will not work correctly
volumes:
- nextcloud_aio_mastercontainer:/mnt/docker-aio-config # This line is not allowed to be changed
- /var/run/docker.sock:/var/run/docker.sock:ro # May be changed on macOS, Windows or docker rootless. See the applicable documentation. If adjusting, don't forget to also set 'DOCKER_SOCKET_PATH'!
- nextcloud_aio_mastercontainer:/mnt/docker-aio-config # This line is not allowed to be changed as otherwise the built-in backup solution will not work
- /var/run/docker.sock:/var/run/docker.sock:ro # May be changed on macOS, Windows or docker rootless. See the applicable documentation. If adjusting, don't forget to also set 'WATCHTOWER_DOCKER_SOCKET_PATH'!
ports:
- 80:80 # Can be removed when running behind a reverse proxy. See https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md
- 80:80 # Can be removed when running behind a web server or reverse proxy (like Apache, Nginx and else). See https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md
- 8080:8080
- 8443:8443 # Can be removed when running behind a reverse proxy. See https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md
- 8443:8443 # Can be removed when running behind a web server or reverse proxy (like Apache, Nginx and else). See https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md
# environment: # Is needed when using any of the options below
# - APACHE_PORT=11000 # Is needed when running behind a reverse proxy. See https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md
# - APACHE_IP_BINDING=127.0.0.1 # Should be set when running behind a reverse proxy that is running on the same host. See https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md
# - AIO_DISABLE_BACKUP_SECTION=false # Setting this to true allows to hide the backup section in the AIO interface.
# - APACHE_PORT=11000 # Is needed when running behind a web server or reverse proxy (like Apache, Nginx and else). See https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md
# - APACHE_IP_BINDING=127.0.0.1 # Should be set when running behind a web server or reverse proxy (like Apache, Nginx and else) that is running on the same host. See https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md
# - COLLABORA_SECCOMP_DISABLED=false # Setting this to true allows to disable Collabora's Seccomp feature. See https://github.com/nextcloud/all-in-one#how-to-disable-collaboras-seccomp-feature
# - DOCKER_SOCKET_PATH=/var/run/docker.sock # Needs to be specified if the docker socket on the host is not located in the default '/var/run/docker.sock'. Otherwise mastercontainer updates will fail.
# - DISABLE_BACKUP_SECTION=false # Setting this to true allows to hide the backup section in the AIO interface.
# - NEXTCLOUD_DATADIR=/mnt/ncdata # Allows to set the host directory for Nextcloud's datadir. See https://github.com/nextcloud/all-in-one#how-to-change-the-default-location-of-nextclouds-datadir
# - NEXTCLOUD_MOUNT=/mnt/ # Allows the Nextcloud container to access the chosen directory on the host. See https://github.com/nextcloud/all-in-one#how-to-allow-the-nextcloud-container-to-access-directories-on-the-host
# - NEXTCLOUD_UPLOAD_LIMIT=10G # Can be adjusted if you need more. See https://github.com/nextcloud/all-in-one#how-to-adjust-the-upload-limit-for-nextcloud
# - NEXTCLOUD_MAX_TIME=3600 # Can be adjusted if you need more. See https://github.com/nextcloud/all-in-one#how-to-adjust-the-max-execution-time-for-nextcloud
# - NEXTCLOUD_MEMORY_LIMIT=512M # Can be adjusted if you need more. See https://github.com/nextcloud/all-in-one#how-to-adjust-the-php-memory-limit-for-nextcloud
# - NEXTCLOUD_TRUSTED_CACERTS_DIR=/path/to/my/cacerts # CA certificates in this directory will be trusted by the OS of the nexcloud container (Useful e.g. for LDAPS) See See https://github.com/nextcloud/all-in-one#how-to-trust-user-defiend-certification-authorities-ca
# - NEXTCLOUD_STARTUP_APPS=twofactor_totp deck tasks calendar contacts apporder # Allows to modify the Nextcloud apps that are installed on starting AIO the first time. See https://github.com/nextcloud/all-in-one#how-to-change-the-nextcloud-apps-that-are-installed-on-the-first-startup
# - NEXTCLOUD_ADDITIONAL_APKS=imagemagick # This allows to add additional packages to the Nextcloud container permanently. Default is imagemagick but can be overwritten by modifying this value. See https://github.com/nextcloud/all-in-one#how-to-add-packets-permanently-to-the-nextcloud-container
# - NEXTCLOUD_STARTUP_APPS=deck twofactor_totp tasks calendar contacts # Allows to modify the Nextcloud apps that are installed on starting AIO the first time. See https://github.com/nextcloud/all-in-one#how-to-change-the-nextcloud-apps-that-are-installed-on-the-first-startup
# - NEXTCLOUD_ADDITIONAL_APKS=imagemagick # This allows to add additional packages to the Nextcloud container permanently. Default is imagemagick but can be overwritten by modifying this value. See https://github.com/nextcloud/all-in-one#how-to-add-os-packages-permanently-to-the-nextcloud-container
# - NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS=imagick # This allows to add additional php extensions to the Nextcloud container permanently. Default is imagick but can be overwritten by modifying this value. See https://github.com/nextcloud/all-in-one#how-to-add-php-extensions-permanently-to-the-nextcloud-container
# - NEXTCLOUD_ENABLE_DRI_DEVICE=true # This allows to enable the /dev/dri device in the Nextcloud container which is needed for hardware-transcoding. See https://github.com/nextcloud/all-in-one#how-to-enable-hardware-transcoding-for-nextcloud
# - TALK_PORT=3478 # This allows to adjust the port that the talk container is using.
# - WATCHTOWER_DOCKER_SOCKET_PATH=/var/run/docker.sock # Needs to be specified if the docker socket on the host is not located in the default '/var/run/docker.sock'. Otherwise mastercontainer updates will fail. For macos it needs to be '/var/run/docker.sock'
# networks: # Is needed when you want to create the nextcloud-aio network with ipv6-support using this file, see the network config at the bottom of the file
# - nextcloud-aio # Is needed when you want to create the nextcloud-aio network with ipv6-support using this file, see the network config at the bottom of the file
# # Optional: Caddy reverse proxy. See https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md
# # You can find further examples here: https://github.com/nextcloud/all-in-one/discussions/588
@@ -46,3 +49,16 @@ services:
# - ./data:/data
# - ./sites:/srv
# network_mode: "host"
# # Optional: If you need ipv6, follow step 1 and 2 of https://github.com/nextcloud/all-in-one/blob/main/docker-ipv6-support.md first and then uncomment the below config in order to activate ipv6 for the internal nextcloud-aio network.
# # Please make sure to uncomment also the networking lines of the mastercontainer above in order to actually create the network with docker-compose
# # Inspired by https://github.com/mailcow/mailcow-dockerized/blob/master/docker-compose.yml
# networks:
# nextcloud-aio:
# name: nextcloud-aio # This line is not allowed to be changed as otherwise the created network will not be used by the other containers of AIO
# driver: bridge
# enable_ipv6: true
# ipam:
# driver: default
# config:
# - subnet: fd12:3456:789a:2::/64 # IPv6 subnet to use

45
docker-ipv6-support.md Normal file
View File

@@ -0,0 +1,45 @@
# IPv6-Support for Docker
Before enabling IPv6-Support for Docker, please note that there are still some unresolved problems in regards to IPv6-Support in Docker. See https://github.com/nextcloud/all-in-one/discussions/2557 for more details on this.
Now that this was mentioned, see the instructions below on how to enable IPv6 for Docker.
## Docker on Linux and Docker-rootless
1. Edit `/etc/docker/daemon.json` (or `~/.config/docker/daemon.json` in case of docker-rootless), set the `ipv6` key to `true` and the `fixed-cidr-v6` key to your IPv6 subnet. In this example we are setting it to `fd12:3456:789a:1::/64`. Additionally set `experimental` to `true` and `ip6tables` to `true` as well. If you are using mailcow and enabled IPv6 with the update.sh, you can keep their daemon.json, it will work too.
```json
{
"ipv6": true,
"fixed-cidr-v6": "fd12:3456:789a:1::/64",
"experimental": true,
"ip6tables": true
}
```
Save the file.
2. Reload the Docker configuration file.
```console
sudo systemctl restart docker
```
3. Make sure that ipv6 is enabled for the internal `nextcloud-aio` network by running `sudo docker network inspect nextcloud-aio | grep EnableIPv6`. On a new instance, this command should return that it did not find a network with this name. Then you can run `sudo docker network create --subnet="fd12:3456:789a:2::/64" --driver bridge --ipv6 nextcloud-aio` in order to create the network with ipv6-support. However if it finds the network and its value `EnableIPv6` is set to false, make sure to follow https://github.com/nextcloud/all-in-one/discussions/2045 in order to recreate the network and enable ipv6 for it.
## Docker Desktop (Windows and macOS)
On Windows and macOS which use Docker Desktop, you need to go into the settings, and select `Docker Engine`. There you should see the currently used daemon.json file.
1. You need to now adjust this json file by setting the `ipv6` key to `true` and the `fixed-cidr-v6` key to your IPv6 subnet. In this example we are setting it to `fd12:3456:789a:1::/64`. Additionally set `experimental` to `true` and `ip6tables` to `true` as well.
```
"ipv6": true,
"fixed-cidr-v6": "fd12:3456:789a:1::/64",
"experimental": true,
"ip6tables": true
```
2. Add these values to the json and make sure to keep the other currently values and that you don't see `Unexpected token in JSON at position ...` before attempting to restart by clicking on `Apply & restart`.
3. Make sure that ipv6 is enabled for the internal `nextcloud-aio` network by running `docker network inspect nextcloud-aio`. On a new instance, this command should return that it did not find a network with this name. Then you can run `docker network create --subnet="fd12:3456:789a:2::/64" --driver bridge --ipv6 nextcloud-aio` in order to create the network with ipv6-support. However if it finds the network and its value `EnableIPv6` is set to false, make sure to follow https://github.com/nextcloud/all-in-one/discussions/2045 in order to recreate the network and enable ipv6 for it.
---
**Note**: This is a copy of the original docker docs at https://docs.docker.com/config/daemon/ipv6/ which apparently are not correct. However experimental is set to true which the ip6tables feature needs. Thus it will not get included into the official docs. However it is needed to make it work in our testing.

View File

@@ -4,11 +4,13 @@ You can run AIO with docker rootless by following the steps below.
0. If docker is already installed, you should consider disabling it first: (`sudo systemctl disable --now docker.service docker.socket`)
1. Install docker rootless by following the official documentation: https://docs.docker.com/engine/security/rootless/#install. The easiest way is installing it **Without packages** (`curl -fsSL https://get.docker.com/rootless | sh`). Further limitations, distribution specific hints, etc. are discussed on the same site. Also do not forget to enable the systemd service, which may not be enabled always by default. See https://docs.docker.com/engine/security/rootless/#usage. (`systemctl --user enable docker`)
1. If you need ipv6 support, you should enable it by following https://docs.docker.com/config/daemon/ipv6/. The daemon.json file is most likely stored in `~/.config/docker/daemon.json`.
1. If you need ipv6 support, you should enable it by following https://github.com/nextcloud/all-in-one/blob/main/docker-ipv6-support.md.
1. Do not forget to set the mentioned environmental variables and in best case add them to your `~/.bashrc` file as shown!
1. Also do not forget to run `loginctl enable-linger USERNAME` (and substitute USERNAME with the correct one) in order to make sure that user services are automatically started after every reboot.
1. Expose the privileged ports by following https://docs.docker.com/engine/security/rootless/#exposing-privileged-ports. (`sudo setcap cap_net_bind_service=ep $(which rootlesskit); systemctl --user restart docker`)
1. Use the official AIO startup command but use `--volume $XDG_RUNTIME_DIR/docker.sock:/var/run/docker.sock:ro` instead of `--volume /var/run/docker.sock:/var/run/docker.sock:ro` and also add `-e DOCKER_SOCKET_PATH=$XDG_RUNTIME_DIR/docker.sock` to the initial container startup (which is needed for mastercontainer updates to work correctly).
1. Use the official AIO startup command but use `--volume $XDG_RUNTIME_DIR/docker.sock:/var/run/docker.sock:ro` instead of `--volume /var/run/docker.sock:/var/run/docker.sock:ro` and also add `--env WATCHTOWER_DOCKER_SOCKET_PATH=$XDG_RUNTIME_DIR/docker.sock` to the initial container startup (which is needed for mastercontainer updates to work correctly).
1. Now everything should work like without docker rootless. You can consider using docker-compose for this or running it behind a reverse proxy. Basically the only thing that needs to be adjusted always in the startup command or docker-compose file (after installing docker rootles) are things that are mentioned in point 3.
**Please note:** All files outside the containers get created, written to and accessed as the user that is running the docker daemon or a subuid of it. So for the built-in backup to work you need to allow this user to write to the target directory. E.g. with `sudo chown -R USERNAME:GROUPNAME /mnt/backup`. The same applies when changing Nextcloud's datadir. E.g. `sudo chown -R USERNAME:GROUPNAME /mnt/ncdata`. When you want to use the NEXTCLOUD_MOUNT option for local external storage, you need to adjust the permissions of the chosen folders to be accessible/writeable by the userid `100032:100032` (if running `grep ^$(whoami): /etc/subuid` as the user that is running the docker daemon returns 100000 as first value).
⚠️ **Additional note:** Almost all commands in this project's documentation use `sudo docker ...`. Since `sudo` is not needed in case of docker rootless, you simply remove `sudo` from the commands and they should work.

View File

@@ -5,15 +5,15 @@ It is possible due to several reasons that you do not want or cannot open Nextcl
The recommended way is the following:
1. Set up your domain correctly to point to your home network
1. Set up a reverse proxy by following the [reverse proxy documentation](./reverse-proxy.md) but only open port 80 (which is needed for the ACME challenge to work - however no real traffic will use this port).
1. Set up a local DNS-server like a pi-hole and configure it to be your local DNS-server for the whole network. Then in the Pi-hole interface, add a custom DNS-record for your domain and overwrite the A-record (and possibly the AAAA-record, too) to point to the local ip-address of your reverse proxy (see https://github.com/nextcloud/all-in-one#how-can-i-access-nextcloud-locally)
1. Enter the the ip-address of your local dns-server in the deamon.json file for docker so that you are sure that all docker containers use the correct local dns-server.
1. Set up a local DNS-server like a pi-hole and configure it to be your local DNS-server for the whole network. Then in the Pi-hole interface, add a custom DNS-record for your domain and overwrite the A-record (and possibly the AAAA-record, too) to point to the private ip-address of your reverse proxy (see https://github.com/nextcloud/all-in-one#how-can-i-access-nextcloud-locally)
1. Enter the ip-address of your local dns-server in the deamon.json file for docker so that you are sure that all docker containers use the correct local dns-server.
1. Now, entering the domain in the AIO-interface should work as expected and should allow you to continue with the setup
## 2. Use the ACME DNS-challenge
You can alternatively use the ACME DNS-challenge to get a valid certificate for Nextcloud. Here is described how to set it up: https://github.com/nextcloud/all-in-one#how-to-get-nextcloud-running-using-the-acme-dns-challenge
## 3. Use Cloudflare
If you do not have any contol over the network, you may think about using Cloudflare Argo Tunnel to get a valid certificate for your Nextcloud. However it will be opened to the public internet then. See https://github.com/nextcloud/all-in-one#how-to-run-nextcloud-behind-a-cloudflare-argo-tunnel how to set this up.
If you do not have any contol over the network, you may think about using Cloudflare Tunnel to get a valid certificate for your Nextcloud. However it will be opened to the public internet then. See https://github.com/nextcloud/all-in-one#how-to-run-nextcloud-behind-a-cloudflare-tunnel how to set this up.
## 4. Buy a certificate and use that
If none of the above ways work for you, you may simply buy a certificate from an issuer for your domain. You then download the certificate onto your server, configure AIO in [reverse proxy mode](./reverse-proxy.md) and use the certificate for your domain in your reverse proxy config.

View File

@@ -1,203 +0,0 @@
version: "3.8"
services:
nextcloud-aio-apache:
container_name: nextcloud-aio-apache
depends_on:
- nextcloud-aio-onlyoffice
- nextcloud-aio-collabora
- nextcloud-aio-talk
- nextcloud-aio-nextcloud
image: nextcloud/aio-apache:latest-arm64
ports:
- ${APACHE_PORT}:${APACHE_PORT}/tcp
environment:
- NC_DOMAIN=${NC_DOMAIN}
- NEXTCLOUD_HOST=nextcloud-aio-nextcloud
- COLLABORA_HOST=nextcloud-aio-collabora
- TALK_HOST=nextcloud-aio-talk
- APACHE_PORT=${APACHE_PORT}
- ONLYOFFICE_HOST=nextcloud-aio-onlyoffice
- TZ=${TIMEZONE}
- APACHE_MAX_SIZE=${APACHE_MAX_SIZE}
- APACHE_MAX_TIME=${NEXTCLOUD_MAX_TIME}
volumes:
- nextcloud_aio_nextcloud:/var/www/html:ro
- nextcloud_aio_apache:/mnt/data:rw
stop_grace_period: 10s
restart: unless-stopped
networks:
- nextcloud-aio
nextcloud-aio-database:
container_name: nextcloud-aio-database
image: nextcloud/aio-postgresql:latest-arm64
volumes:
- nextcloud_aio_database:/var/lib/postgresql/data:rw
- nextcloud_aio_database_dump:/mnt/data:rw
environment:
- POSTGRES_PASSWORD=${DATABASE_PASSWORD}
- POSTGRES_DB=nextcloud_database
- POSTGRES_USER=nextcloud
- TZ=${TIMEZONE}
- PGTZ=${TIMEZONE}
stop_grace_period: 1800s
restart: unless-stopped
networks:
- nextcloud-aio
nextcloud-aio-nextcloud:
container_name: nextcloud-aio-nextcloud
depends_on:
- nextcloud-aio-database
- nextcloud-aio-redis
- nextcloud-aio-fulltextsearch
- nextcloud-aio-imaginary
image: nextcloud/aio-nextcloud:latest-arm64
volumes:
- nextcloud_aio_nextcloud:/var/www/html:rw
- ${NEXTCLOUD_DATADIR}:/mnt/ncdata:rw
- ${NEXTCLOUD_MOUNT}:${NEXTCLOUD_MOUNT}:rw
- ${NEXTCLOUD_TRUSTED_CACERTS_DIR}:/usr/local/share/ca-certificates:ro
environment:
- POSTGRES_HOST=nextcloud-aio-database
- POSTGRES_PASSWORD=${DATABASE_PASSWORD}
- POSTGRES_DB=nextcloud_database
- POSTGRES_USER=nextcloud
- REDIS_HOST=nextcloud-aio-redis
- REDIS_HOST_PASSWORD=${REDIS_PASSWORD}
- AIO_TOKEN=${AIO_TOKEN}
- NC_DOMAIN=${NC_DOMAIN}
- ADMIN_USER=admin
- ADMIN_PASSWORD=${NEXTCLOUD_PASSWORD}
- NEXTCLOUD_DATA_DIR=/mnt/ncdata
- OVERWRITEHOST=${NC_DOMAIN}
- OVERWRITEPROTOCOL=https
- TURN_SECRET=${TURN_SECRET}
- SIGNALING_SECRET=${SIGNALING_SECRET}
- ONLYOFFICE_SECRET=${ONLYOFFICE_SECRET}
- AIO_URL=${AIO_URL}
- NEXTCLOUD_MOUNT=${NEXTCLOUD_MOUNT}
- ONLYOFFICE_ENABLED=${ONLYOFFICE_ENABLED}
- COLLABORA_ENABLED=${COLLABORA_ENABLED}
- COLLABORA_HOST=nextcloud-aio-collabora
- TALK_ENABLED=${TALK_ENABLED}
- ONLYOFFICE_HOST=nextcloud-aio-onlyoffice
- UPDATE_NEXTCLOUD_APPS=${UPDATE_NEXTCLOUD_APPS}
- TZ=${TIMEZONE}
- TALK_PORT=${TALK_PORT}
- IMAGINARY_ENABLED=${IMAGINARY_ENABLED}
- IMAGINARY_HOST=nextcloud-aio-imaginary
- PHP_UPLOAD_LIMIT=${NEXTCLOUD_UPLOAD_LIMIT}
- PHP_MEMORY_LIMIT=${NEXTCLOUD_MEMORY_LIMIT}
- FULLTEXTSEARCH_ENABLED=${FULLTEXTSEARCH_ENABLED}
- FULLTEXTSEARCH_HOST=nextcloud-aio-fulltextsearch
- PHP_MAX_TIME=${NEXTCLOUD_MAX_TIME}
- TRUSTED_CACERTS_DIR=${NEXTCLOUD_TRUSTED_CACERTS_DIR}
- STARTUP_APPS=${NEXTCLOUD_STARTUP_APPS}
- ADDITIONAL_APKS=${NEXTCLOUD_ADDITIONAL_APKS}
- ADDITIONAL_PHP_EXTENSIONS=${NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS}
stop_grace_period: 10s
restart: unless-stopped
networks:
- nextcloud-aio
nextcloud-aio-redis:
container_name: nextcloud-aio-redis
image: nextcloud/aio-redis:latest-arm64
environment:
- REDIS_HOST_PASSWORD=${REDIS_PASSWORD}
- TZ=${TIMEZONE}
stop_grace_period: 10s
restart: unless-stopped
networks:
- nextcloud-aio
nextcloud-aio-collabora:
container_name: nextcloud-aio-collabora
image: nextcloud/aio-collabora:latest-arm64
environment:
- aliasgroup1=https://${NC_DOMAIN}:443
- extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:logging.level=warning --o:home_mode.enable=true ${COLLABORA_SECCOMP_POLICY}
- dictionaries=${COLLABORA_DICTIONARIES}
- TZ=${TIMEZONE}
stop_grace_period: 10s
restart: unless-stopped
networks:
- nextcloud-aio
nextcloud-aio-talk:
container_name: nextcloud-aio-talk
image: nextcloud/aio-talk:latest-arm64
ports:
- ${TALK_PORT}:${TALK_PORT}/tcp
- ${TALK_PORT}:${TALK_PORT}/udp
environment:
- NC_DOMAIN=${NC_DOMAIN}
- TURN_SECRET=${TURN_SECRET}
- SIGNALING_SECRET=${SIGNALING_SECRET}
- JANUS_API_KEY=${JANUS_API_KEY}
- TZ=${TIMEZONE}
- TALK_PORT=${TALK_PORT}
stop_grace_period: 10s
restart: unless-stopped
networks:
- nextcloud-aio
nextcloud-aio-onlyoffice:
container_name: nextcloud-aio-onlyoffice
image: nextcloud/aio-onlyoffice:latest-arm64
environment:
- TZ=${TIMEZONE}
- JWT_ENABLED=true
- JWT_HEADER=AuthorizationJwt
- JWT_SECRET=${ONLYOFFICE_SECRET}
volumes:
- nextcloud_aio_onlyoffice:/var/lib/onlyoffice:rw
stop_grace_period: 10s
restart: unless-stopped
networks:
- nextcloud-aio
nextcloud-aio-imaginary:
container_name: nextcloud-aio-imaginary
image: nextcloud/aio-imaginary:latest-arm64
environment:
- TZ=${TIMEZONE}
stop_grace_period: 10s
restart: unless-stopped
networks:
- nextcloud-aio
nextcloud-aio-fulltextsearch:
container_name: nextcloud-aio-fulltextsearch
image: nextcloud/aio-fulltextsearch:latest-arm64
environment:
- TZ=${TIMEZONE}
- discovery.type=single-node
- ES_JAVA_OPTS=-Xms1024M -Xmx1024M
volumes:
- nextcloud_aio_elasticsearch:/usr/share/elasticsearch/data:rw
stop_grace_period: 10s
restart: unless-stopped
networks:
- nextcloud-aio
volumes:
nextcloud_aio_apache:
name: nextcloud_aio_apache
nextcloud_aio_database:
name: nextcloud_aio_database
nextcloud_aio_database_dump:
name: nextcloud_aio_database_dump
nextcloud_aio_elasticsearch:
name: nextcloud_aio_elasticsearch
nextcloud_aio_nextcloud:
name: nextcloud_aio_nextcloud
nextcloud_aio_onlyoffice:
name: nextcloud_aio_onlyoffice
nextcloud_aio_nextcloud_data:
name: nextcloud_aio_nextcloud_data
networks:
nextcloud-aio:

View File

@@ -2,7 +2,6 @@ version: "3.8"
services:
nextcloud-aio-apache:
container_name: nextcloud-aio-apache
depends_on:
- nextcloud-aio-onlyoffice
- nextcloud-aio-collabora
@@ -10,7 +9,7 @@ services:
- nextcloud-aio-nextcloud
image: nextcloud/aio-apache:latest
ports:
- ${APACHE_PORT}:${APACHE_PORT}/tcp
- ${APACHE_IP_BINDING}:${APACHE_PORT}:${APACHE_PORT}/tcp
environment:
- NC_DOMAIN=${NC_DOMAIN}
- NEXTCLOUD_HOST=nextcloud-aio-nextcloud
@@ -24,14 +23,14 @@ services:
volumes:
- nextcloud_aio_nextcloud:/var/www/html:ro
- nextcloud_aio_apache:/mnt/data:rw
stop_grace_period: 10s
restart: unless-stopped
networks:
- nextcloud-aio
nextcloud-aio-database:
container_name: nextcloud-aio-database
image: nextcloud/aio-postgresql:latest
expose:
- "5432"
volumes:
- nextcloud_aio_database:/var/lib/postgresql/data:rw
- nextcloud_aio_database_dump:/mnt/data:rw
@@ -45,9 +44,9 @@ services:
restart: unless-stopped
networks:
- nextcloud-aio
shm_size: 268435456
nextcloud-aio-nextcloud:
container_name: nextcloud-aio-nextcloud
depends_on:
- nextcloud-aio-database
- nextcloud-aio-redis
@@ -55,6 +54,9 @@ services:
- nextcloud-aio-fulltextsearch
- nextcloud-aio-imaginary
image: nextcloud/aio-nextcloud:latest
expose:
- "9000"
- "7867"
volumes:
- nextcloud_aio_nextcloud:/var/www/html:rw
- ${NEXTCLOUD_DATADIR}:/mnt/ncdata:rw
@@ -100,68 +102,79 @@ services:
- STARTUP_APPS=${NEXTCLOUD_STARTUP_APPS}
- ADDITIONAL_APKS=${NEXTCLOUD_ADDITIONAL_APKS}
- ADDITIONAL_PHP_EXTENSIONS=${NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS}
stop_grace_period: 10s
- INSTALL_LATEST_MAJOR=${INSTALL_LATEST_MAJOR}
restart: unless-stopped
networks:
- nextcloud-aio
nextcloud-aio-redis:
container_name: nextcloud-aio-redis
image: nextcloud/aio-redis:latest
expose:
- "6379"
environment:
- REDIS_HOST_PASSWORD=${REDIS_PASSWORD}
- TZ=${TIMEZONE}
stop_grace_period: 10s
volumes:
- nextcloud_aio_redis:/data:rw
restart: unless-stopped
networks:
- nextcloud-aio
nextcloud-aio-collabora:
container_name: nextcloud-aio-collabora
profiles: ["collabora"]
image: nextcloud/aio-collabora:latest
expose:
- "9980"
environment:
- aliasgroup1=https://${NC_DOMAIN}:443
- extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:logging.level=warning --o:home_mode.enable=true ${COLLABORA_SECCOMP_POLICY}
- extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:mount_jail_tree=false --o:logging.level=warning --o:home_mode.enable=true ${COLLABORA_SECCOMP_POLICY} --o:remote_font_config.url=https://${NC_DOMAIN}/apps/richdocuments/settings/fonts.json
- dictionaries=${COLLABORA_DICTIONARIES}
- TZ=${TIMEZONE}
stop_grace_period: 10s
- server_name=${NC_DOMAIN}
- DONT_GEN_SSL_CERT=1
volumes:
- nextcloud_aio_collabora_fonts:/opt/cool/systemplate/tmpfonts:rw
restart: unless-stopped
networks:
- nextcloud-aio
nextcloud-aio-talk:
container_name: nextcloud-aio-talk
profiles: ["talk"]
image: nextcloud/aio-talk:latest
ports:
- ${TALK_PORT}:${TALK_PORT}/tcp
- ${TALK_PORT}:${TALK_PORT}/udp
expose:
- "8081"
environment:
- NC_DOMAIN=${NC_DOMAIN}
- TURN_SECRET=${TURN_SECRET}
- SIGNALING_SECRET=${SIGNALING_SECRET}
- JANUS_API_KEY=${JANUS_API_KEY}
- TZ=${TIMEZONE}
- TALK_PORT=${TALK_PORT}
stop_grace_period: 10s
restart: unless-stopped
networks:
- nextcloud-aio
nextcloud-aio-clamav:
container_name: nextcloud-aio-clamav
profiles: ["clamav"]
image: nextcloud/aio-clamav:latest
expose:
- "3310"
environment:
- TZ=${TIMEZONE}
- CLAMD_STARTUP_TIMEOUT=90
volumes:
- nextcloud_aio_clamav:/var/lib/clamav:rw
stop_grace_period: 10s
restart: unless-stopped
networks:
- nextcloud-aio
nextcloud-aio-onlyoffice:
container_name: nextcloud-aio-onlyoffice
profiles: ["onlyoffice"]
image: nextcloud/aio-onlyoffice:latest
expose:
- "80"
environment:
- TZ=${TIMEZONE}
- JWT_ENABLED=true
@@ -169,31 +182,35 @@ services:
- JWT_SECRET=${ONLYOFFICE_SECRET}
volumes:
- nextcloud_aio_onlyoffice:/var/lib/onlyoffice:rw
stop_grace_period: 10s
restart: unless-stopped
networks:
- nextcloud-aio
nextcloud-aio-imaginary:
container_name: nextcloud-aio-imaginary
profiles: ["imaginary"]
image: nextcloud/aio-imaginary:latest
expose:
- "9000"
environment:
- TZ=${TIMEZONE}
stop_grace_period: 10s
restart: unless-stopped
networks:
- nextcloud-aio
cap_add:
- SYS_NICE
nextcloud-aio-fulltextsearch:
container_name: nextcloud-aio-fulltextsearch
profiles: ["fulltextsearch"]
image: nextcloud/aio-fulltextsearch:latest
expose:
- "9200"
environment:
- TZ=${TIMEZONE}
- discovery.type=single-node
- ES_JAVA_OPTS=-Xms1024M -Xmx1024M
- POSTGRES_HOST=nextcloud-aio-database
volumes:
- nextcloud_aio_elasticsearch:/usr/share/elasticsearch/data:rw
stop_grace_period: 10s
restart: unless-stopped
networks:
- nextcloud-aio
@@ -203,6 +220,8 @@ volumes:
name: nextcloud_aio_apache
nextcloud_aio_clamav:
name: nextcloud_aio_clamav
nextcloud_aio_collabora_fonts:
name: nextcloud_aio_collabora_fonts
nextcloud_aio_database:
name: nextcloud_aio_database
nextcloud_aio_database_dump:
@@ -213,8 +232,18 @@ volumes:
name: nextcloud_aio_nextcloud
nextcloud_aio_onlyoffice:
name: nextcloud_aio_onlyoffice
nextcloud_aio_redis:
name: nextcloud_aio_redis
nextcloud_aio_nextcloud_data:
name: nextcloud_aio_nextcloud_data
# Inspired by https://github.com/mailcow/mailcow-dockerized/blob/master/docker-compose.yml
networks:
nextcloud-aio:
name: nextcloud-aio
driver: bridge
enable_ipv6: true
ipam:
driver: default
config:
- subnet: ${IPV6_NETWORK}

View File

@@ -5,12 +5,14 @@ You can run the containers that are build for AIO with docker-compose. This come
### Advantages
- You can run it without a container having access to the docker socket
- You can modify all values on your own
- You can run the containers with docker swarm
### Disadvantages
- You lose the AIO interface
- You lose update notifications and automatic updates
- You lose all AIO backup and restore features
- You need to know what you are doing, especially when modifying the docker-compose file
- **You need to know what you are doing, especially when modifying the docker-compose file**
- For updating, you need to strictly follow the at the bottom described update routine
- Probably more
## How to use this?
@@ -19,20 +21,26 @@ First, install docker and docker-compose if not already done. Then simply run th
git clone https://github.com/nextcloud/all-in-one.git
cd all-in-one/manual-install
```
Then copy the sample.conf to a new file, e.g. `cp sample.conf my.conf`, open the new conf file, e.g. with `nano my.conf`, edit all values that are marked with `# TODO!`, close and save the file.
Then copy the sample.conf to default environment file, e.g. `cp sample.conf .env`, open the new conf file, e.g. with `nano .env`, edit all values that are marked with `# TODO!`, close and save the file. (Note: there is no clamav image for arm64).
Now copy the provided yaml file to a docker-compose file by running on x64 `cp latest.yml docker-compose.yml` and on arm64 `cp latest-arm64.yml docker-compose.yml`.
Now copy the provided yaml file to a docker-compose file by running `cp latest.yml docker-compose.yml`.
Now you should be ready to go with `sudo docker-compose --env-file my.conf up`.
Now you should be ready to go with `sudo docker-compose up`.
## Docker profiles
The default profile of `latest.yml` only provide the minimum necessary services: nextcloud, database, redis and apache. To get optional services collabora, onlyoffice, talk, clamav, imaginary or fulltextsearch use additional arguments for each of them, for example `--profile collabora`. (Note: there is no clamav image for arm64).
For a complete all-in-one with collabora use `sudo docker-compose --profile collabora --profile talk --profile clamav --profile imaginary --profile fulltextsearch up`. (Note: there is no clamav image for arm64).
## How to update?
Since the AIO containers may change in the future, it is highly recommended to strictly follow the following procedure whenever you want to upgrade your containers.
1. Run `sudo docker-compose --env-file my.conf down` to stop all running containers
1. If your previous copy of `sample.conf` is named `my.conf`, run `mv my.conf .env` in order to rename the file to `.env`.
1. Run `sudo docker-compose down` to stop all running containers
1. Back up all important files and folders
1. Run `git pull` in order to get the updated yaml files from the repository. Now bring your `docker-compose.yml` file up-to-date with the updated one from the repository. You can use `diff docker-compose.yml latest.yml` on x64 and `diff docker-compose.yml latest-arm64.yml` on arm64 for comparing.
1. Run `git pull` in order to get the updated yaml files from the repository. Now bring your `docker-compose.yml` file up-to-date with the updated one from the repository. You can use `diff docker-compose.yml latest.yml` for comparing. ⚠️ **Please note**: Starting with AIO v5.1.0, ipv6 networking will be enabled by default, so make sure to either enable it first by following steps 1 and 2 of https://github.com/nextcloud/all-in-one/blob/main/docker-ipv6-support.md and then proceed with the steps below or disable ipv6 networking by editing the docker-compose file and removing ipv6 from the network.
1. Also have a look at the `sample.conf` if any variable was added or renamed and add that to your conf file as well. Here may help the diff command as well.
1. After the file update was successful, simply run `sudo docker-compose --env-file my.conf pull` to pull the new images.
1. At the end run `sudo docker-compose --env-file my.conf up` in order to start and update the containers with the new configuration.
1. After the file update was successful, simply run `sudo docker-compose pull` to pull the new images.
1. At the end run `sudo docker-compose up` in order to start and update the containers with the new configuration.
## FAQ
### Backup and restore?

View File

@@ -1,15 +1,16 @@
AIO_TOKEN=123456 # Has no function but needs to be set!
AIO_URL=localhost # Has no function but needs to be set!
APACHE_IP_BINDING=0.0.0.0 # This can be changed to e.g. 127.0.0.1 if you want to run AIO behind a web server or reverse proxy (like Apache, Nginx and else) and if that is running on the same host and using localhost to connect
APACHE_MAX_SIZE=10737418240 # This needs to be an integer and in sync with NEXTCLOUD_UPLOAD_LIMIT
APACHE_PORT=443 # Changing this to a different value than 443 will allow you to run it behind a reverse proxy.
CLAMAV_ENABLED=no # Setting this to "yes" enables the option in Nextcloud automatically.
COLLABORA_DICTIONARIES=de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru # You can change this in order to enable other dictionaries for collabora
COLLABORA_ENABLED=yes # Setting this to "yes" enables the option in Nextcloud automatically.
APACHE_PORT=443 # Changing this to a different value than 443 will allow you to run it behind a web server or reverse proxy (like Apache, Nginx and else).
CLAMAV_ENABLED="no" # Setting this to "yes" (with quotes) enables the option in Nextcloud automatically.
COLLABORA_DICTIONARIES="de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru" # You can change this in order to enable other dictionaries for collabora
COLLABORA_ENABLED="no" # Setting this to "yes" (with quotes) enables the option in Nextcloud automatically.
COLLABORA_SECCOMP_POLICY=--o:security.seccomp=true # Changing the value to false allows to disable the seccomp feature of the Collabora container.
DATABASE_PASSWORD= # TODO! This needs to be a unique and good password!
FULLTEXTSEARCH_ENABLED=no # Setting this to "yes" enables the option in Nextcloud automatically.
IMAGINARY_ENABLED=no # Setting this to "yes" enables the option in Nextcloud automatically.
JANUS_API_KEY= # TODO! This needs to be a unique and good password!
FULLTEXTSEARCH_ENABLED="no" # Setting this to "yes" (with quotes) enables the option in Nextcloud automatically.
IMAGINARY_ENABLED="no" # Setting this to "yes" (with quotes) enables the option in Nextcloud automatically.
INSTALL_LATEST_MAJOR=no # Setting this to yes will install the latest Major Nextcloud version upon the first installation
NC_DOMAIN=yourdomain.com # TODO! Needs to be changed to the domain that you want to use for Nextcloud.
NEXTCLOUD_ADDITIONAL_APKS=imagemagick # This allows to add additional packages to the Nextcloud container permanently. Default is imagemagick but can be overwritten by modifying this value.
NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS=imagick # This allows to add additional php extensions to the Nextcloud container permanently. Default is imagick but can be overwritten by modifying this value.
@@ -18,15 +19,16 @@ NEXTCLOUD_MAX_TIME=3600 # This allows to change the upload time limit o
NEXTCLOUD_MEMORY_LIMIT=512M # This allows to change the PHP memory limit of the Nextcloud container
NEXTCLOUD_MOUNT=/mnt/ # This allows the Nextcloud container to access directories on the host. It must never be equal to the value of NEXTCLOUD_DATADIR!
NEXTCLOUD_PASSWORD= # TODO! This is the password of the initially created Nextcloud admin with username "admin".
NEXTCLOUD_STARTUP_APPS=twofactor_totp deck tasks calendar contacts apporder # Allows to modify the Nextcloud apps that are installed on starting AIO the first time
NEXTCLOUD_STARTUP_APPS="deck twofactor_totp tasks calendar contacts" # Allows to modify the Nextcloud apps that are installed on starting AIO the first time
NEXTCLOUD_TRUSTED_CACERTS_DIR=/usr/local/share/ca-certificates/my-custom-ca # Nextcloud container will trust all the Certification Authorities, whose certificates are included in the given directory.
NEXTCLOUD_UPLOAD_LIMIT=10G # This allows to change the upload limit of the Nextcloud container
ONLYOFFICE_ENABLED=no # Setting this to "yes" enables the option in Nextcloud automatically.
ONLYOFFICE_ENABLED="no" # Setting this to "yes" (with quotes) enables the option in Nextcloud automatically.
ONLYOFFICE_SECRET= # TODO! This needs to be a unique and good password!
REDIS_PASSWORD= # TODO! This needs to be a unique and good password!
SIGNALING_SECRET= # TODO! This needs to be a unique and good password!
TALK_ENABLED=yes # Setting this to "yes" enables the option in Nextcloud automatically.
TALK_ENABLED="no" # Setting this to "yes" (with quotes) enables the option in Nextcloud automatically.
TALK_PORT=3478 # This allows to adjust the port that the talk container is using.
TIMEZONE=Europe/Berlin # TODO! This is the timezone that your containers will use.
TURN_SECRET= # TODO! This needs to be a unique and good password!
UPDATE_NEXTCLOUD_APPS=no # When setting to yes, it will automatically update all installed Nextcloud apps upon container startup on saturdays.
UPDATE_NEXTCLOUD_APPS="no" # When setting to "yes" (with quotes), it will automatically update all installed Nextcloud apps upon container startup on saturdays.
IPV6_NETWORK=fd12:3456:789a:2::/64 # IPv6 subnet to use

View File

@@ -1,15 +1,24 @@
#!/bin/bash
set -ex
jq -c . ./php/containers.json > /tmp/containers.json
sed -i 's|","location":"|:|g' /tmp/containers.json
sed -i 's|aio_services_v1|services|g' /tmp/containers.json
sed -i 's|","destination":"|:|g' /tmp/containers.json
sed -i 's|","writeable":false|:ro"|g' /tmp/containers.json
sed -i 's|","writeable":true|:rw"|g' /tmp/containers.json
sed -i 's|","port_number":"|:|g' /tmp/containers.json
sed -i 's|","protocol":"|/|g' /tmp/containers.json
sed -i 's|"ip_binding":":|"ip_binding":"|g' /tmp/containers.json
cat /tmp/containers.json
OUTPUT="$(cat /tmp/containers.json)"
OUTPUT="$(echo "$OUTPUT" | jq 'del(.production[].internalPorts)')"
OUTPUT="$(echo "$OUTPUT" | jq 'del(.production[].secrets)')"
OUTPUT="$(echo "$OUTPUT" | jq 'del(.production[] | select(.identifier == "nextcloud-aio-watchtower"))')"
OUTPUT="$(echo "$OUTPUT" | jq 'del(.production[] | select(.identifier == "nextcloud-aio-domaincheck"))')"
OUTPUT="$(echo "$OUTPUT" | jq 'del(.production[] | select(.identifier == "nextcloud-aio-borgbackup"))')"
OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[].internal_port)')"
OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[].secrets)')"
OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[].devices)')"
OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[].backup_volumes)')"
OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[] | select(.container_name == "nextcloud-aio-watchtower"))')"
OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[] | select(.container_name == "nextcloud-aio-domaincheck"))')"
OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[] | select(.container_name == "nextcloud-aio-borgbackup"))')"
snap install yq
mkdir -p ./manual-install
@@ -17,24 +26,18 @@ echo "$OUTPUT" | yq -P > ./manual-install/containers.yml
cd manual-install || exit
sed -i "s|'||g" containers.yml
sed -i 's|production:|services:|' containers.yml
sed -i 's|- identifier:| container_name:|' containers.yml
sed -i 's|restartPolicy:|restart:|' containers.yml
sed -i 's|environmentVariables:|environment:|' containers.yml
sed -i '/displayName:/d' containers.yml
sed -i 's|maxShutdownTime:|stop_grace_period:|' containers.yml
sed -i '/display_name:/d' containers.yml
sed -i '/stop_grace_period:/s/$/s/' containers.yml
sed -i 's|containerName:|image:|' containers.yml
sed -i '/: \[\]/d' containers.yml
sed -i 's|dependsOn:|depends_on:|' containers.yml
sed -i 's|- name: |- |' containers.yml
sed -i 's|- source: |- |' containers.yml
sed -i 's|- ip_binding: |- |' containers.yml
TCP="$(grep -oP '[%A-Z0-9_]+/tcp' containers.yml | sort -u)"
mapfile -t TCP <<< "$TCP"
for port in "${TCP[@]}"
do
solve_port="${port%%/tcp}"
sed -i "s|$port|$solve_port:$solve_port/tcp|" containers.yml
sed -i "s|$solve_port/tcp|$solve_port:$solve_port/tcp|" containers.yml
done
UDP="$(grep -oP '[%A-Z0-9_]+/udp' containers.yml | sort -u)"
@@ -42,7 +45,7 @@ mapfile -t UDP <<< "$UDP"
for port in "${UDP[@]}"
do
solve_port="${port%%/udp}"
sed -i "s|$port|$solve_port:$solve_port/udp|" containers.yml
sed -i "s|$solve_port/udp|$solve_port:$solve_port/udp|" containers.yml
done
rm -f sample.conf
@@ -56,10 +59,11 @@ do
sed -i "s|$variable|\${$sole_variable}|g" containers.yml
done
sed -i 's|_ENABLED=|_ENABLED=no # Setting this to "yes" enables the option in Nextcloud automatically.|' sample.conf
sed -i 's|TALK_ENABLED=no|TALK_ENABLED=yes|' sample.conf
sed -i 's|COLLABORA_ENABLED=no|COLLABORA_ENABLED=yes|' sample.conf
sed -i 's|COLLABORA_DICTIONARIES=|COLLABORA_DICTIONARIES=de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru # You can change this in order to enable other dictionaries for collabora|' sample.conf
sed -i 's|_ENABLED=|_ENABLED="no" # Setting this to "yes" (with quotes) enables the option in Nextcloud automatically.|' sample.conf
sed -i 's|CLAMAV_ENABLED=no.*|CLAMAV_ENABLED="no" # Setting this to "yes" (with quotes) enables the option in Nextcloud automatically. Note: arm64 has no clamav support|' sample.conf
sed -i 's|TALK_ENABLED=no|TALK_ENABLED="yes"|' sample.conf
sed -i 's|COLLABORA_ENABLED=no|COLLABORA_ENABLED="yes"|' sample.conf
sed -i 's|COLLABORA_DICTIONARIES=|COLLABORA_DICTIONARIES="de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru" # You can change this in order to enable other dictionaries for collabora|' sample.conf
sed -i 's|NEXTCLOUD_DATADIR=|NEXTCLOUD_DATADIR=nextcloud_aio_nextcloud_data # You can change this to e.g. "/mnt/ncdata" to map it to a location on your host. It needs to be adjusted before the first startup and never afterwards!|' sample.conf
sed -i 's|NEXTCLOUD_MOUNT=|NEXTCLOUD_MOUNT=/mnt/ # This allows the Nextcloud container to access directories on the host. It must never be equal to the value of NEXTCLOUD_DATADIR!|' sample.conf
sed -i 's|NEXTCLOUD_UPLOAD_LIMIT=|NEXTCLOUD_UPLOAD_LIMIT=10G # This allows to change the upload limit of the Nextcloud container|' sample.conf
@@ -67,8 +71,9 @@ sed -i 's|NEXTCLOUD_MEMORY_LIMIT=|NEXTCLOUD_MEMORY_LIMIT=512M # This al
sed -i 's|APACHE_MAX_SIZE=|APACHE_MAX_SIZE=10737418240 # This needs to be an integer and in sync with NEXTCLOUD_UPLOAD_LIMIT|' sample.conf
sed -i 's|NEXTCLOUD_MAX_TIME=|NEXTCLOUD_MAX_TIME=3600 # This allows to change the upload time limit of the Nextcloud container|' sample.conf
sed -i 's|NEXTCLOUD_TRUSTED_CACERTS_DIR=|NEXTCLOUD_TRUSTED_CACERTS_DIR=/usr/local/share/ca-certificates/my-custom-ca # Nextcloud container will trust all the Certification Authorities, whose certificates are included in the given directory.|' sample.conf
sed -i 's|UPDATE_NEXTCLOUD_APPS=|UPDATE_NEXTCLOUD_APPS=no # When setting to yes, it will automatically update all installed Nextcloud apps upon container startup on saturdays.|' sample.conf
sed -i 's|APACHE_PORT=|APACHE_PORT=443 # Changing this to a different value than 443 will allow you to run it behind a reverse proxy.|' sample.conf
sed -i 's|UPDATE_NEXTCLOUD_APPS=|UPDATE_NEXTCLOUD_APPS="no" # When setting to "yes" (with quotes), it will automatically update all installed Nextcloud apps upon container startup on saturdays.|' sample.conf
sed -i 's|APACHE_PORT=|APACHE_PORT=443 # Changing this to a different value than 443 will allow you to run it behind a web server or reverse proxy (like Apache, Nginx and else).|' sample.conf
sed -i 's|APACHE_IP_BINDING=|APACHE_IP_BINDING=0.0.0.0 # This can be changed to e.g. 127.0.0.1 if you want to run AIO behind a web server or reverse proxy (like Apache, Nginx and else) and if that is running on the same host and using localhost to connect|' sample.conf
sed -i 's|TALK_PORT=|TALK_PORT=3478 # This allows to adjust the port that the talk container is using.|' sample.conf
sed -i 's|AIO_TOKEN=|AIO_TOKEN=123456 # Has no function but needs to be set!|' sample.conf
sed -i 's|AIO_URL=|AIO_URL=localhost # Has no function but needs to be set!|' sample.conf
@@ -76,10 +81,12 @@ sed -i 's|NC_DOMAIN=|NC_DOMAIN=yourdomain.com # TODO! Needs to be chang
sed -i 's|NEXTCLOUD_PASSWORD=|NEXTCLOUD_PASSWORD= # TODO! This is the password of the initially created Nextcloud admin with username "admin".|' sample.conf
sed -i 's|TIMEZONE=|TIMEZONE=Europe/Berlin # TODO! This is the timezone that your containers will use.|' sample.conf
sed -i 's|COLLABORA_SECCOMP_POLICY=|COLLABORA_SECCOMP_POLICY=--o:security.seccomp=true # Changing the value to false allows to disable the seccomp feature of the Collabora container.|' sample.conf
sed -i 's|NEXTCLOUD_STARTUP_APPS=|NEXTCLOUD_STARTUP_APPS=twofactor_totp deck tasks calendar contacts apporder # Allows to modify the Nextcloud apps that are installed on starting AIO the first time|' sample.conf
sed -i 's|NEXTCLOUD_STARTUP_APPS=|NEXTCLOUD_STARTUP_APPS="deck twofactor_totp tasks calendar contacts" # Allows to modify the Nextcloud apps that are installed on starting AIO the first time|' sample.conf
sed -i 's|NEXTCLOUD_ADDITIONAL_APKS=|NEXTCLOUD_ADDITIONAL_APKS=imagemagick # This allows to add additional packages to the Nextcloud container permanently. Default is imagemagick but can be overwritten by modifying this value.|' sample.conf
sed -i 's|NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS=|NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS=imagick # This allows to add additional php extensions to the Nextcloud container permanently. Default is imagick but can be overwritten by modifying this value.|' sample.conf
sed -i 's|INSTALL_LATEST_MAJOR=|INSTALL_LATEST_MAJOR=no # Setting this to yes will install the latest Major Nextcloud version upon the first installation|' sample.conf
sed -i 's|=$|= # TODO! This needs to be a unique and good password!|' sample.conf
echo 'IPV6_NETWORK=fd12:3456:789a:2::/64 # IPv6 subnet to use' >> sample.conf
cat sample.conf
@@ -92,6 +99,11 @@ do
if [ "$name" != "nextcloud-aio-apache" ]; then
OUTPUT="$(echo "$OUTPUT" | sed "/ $name:/i\ ")"
fi
if ! echo "$name" | grep "apache$" && ! echo "$name" | grep "database$" && ! echo "$name" | grep "nextcloud$" && ! echo "$name" | grep "redis$"; then
sed -i '/container_name/d' containers.yml
SLIM_NAME="${name##nextcloud-aio-}"
OUTPUT="$(echo "$OUTPUT" | sed "/container_name: $name$/a\ \ \ \ profiles:\ \[\"$SLIM_NAME\"\]")"
fi
done
OUTPUT="$(echo "$OUTPUT" | sed "/restart: /a\ \ \ \ networks:\n\ \ \ \ \ \ - nextcloud-aio")"
@@ -101,6 +113,9 @@ echo "" >> containers.yml
echo "$OUTPUT" >> containers.yml
sed -i '/container_name/d' containers.yml
sed -i 's|^ $||' containers.yml
VOLUMES="$(grep -oP 'nextcloud_aio_[a-z_]+' containers.yml | sort -u)"
mapfile -t VOLUMES <<< "$VOLUMES"
echo "" >> containers.yml
@@ -115,17 +130,21 @@ done
cat << NETWORK >> containers.yml
# Inspired by https://github.com/mailcow/mailcow-dockerized/blob/master/docker-compose.yml
networks:
nextcloud-aio:
name: nextcloud-aio
driver: bridge
enable_ipv6: true
ipam:
driver: default
config:
- subnet: \${IPV6_NETWORK}
NETWORK
cat containers.yml > latest.yml
sed -i '/image:/s/$/:latest/' latest.yml
cat containers.yml > latest-arm64.yml
sed -i '/image:/s/$/:latest-arm64/' latest-arm64.yml
sed -i '/ nextcloud-aio-clamav:/,/^ $/d' latest-arm64.yml
sed -i '/nextcloud[-_]aio[-_]clamav/d' latest-arm64.yml
sed -i '/CLAMAV_ENABLED/d' latest-arm64.yml
sed -i "/image:/s/$/:latest/" latest.yml
rm containers.yml
set +ex

View File

@@ -6,8 +6,9 @@ The only way to fix this on your side is upgrading regularly (e.g. by enabling d
1. Start all containers from the aio interface (now, it will report that Nextcloud is restarting because it is not able to start due to the above mentioned problem)
1. Do **not** click on `Stop containers` because you will need them running going forward, see below
1. Find out with which PHP version your installed Nextcloud is compatible by running `sudo docker exec nextcloud-aio-nextcloud cat lib/versioncheck.php`. (There you will find information about the max. supported PHP version.)
1. Stop the Nextcloud container and the Apache container by running `sudo docker stop nextcloud-aio-nextcloud && sudo docker stop nextcloud-aio-apache`.
1. Find out with which PHP version your installed Nextcloud is compatible by running `sudo cat /var/lib/docker/volumes/nextcloud_aio_nextcloud/_data/lib/versioncheck.php`. (There you will find information about the max. supported PHP version.)
1. Run the following commands in order to reverse engineer the Nextcloud container:
```bash
sudo docker pull assaflavie/runlike
@@ -15,7 +16,7 @@ The only way to fix this on your side is upgrading regularly (e.g. by enabling d
sudo docker run --rm -v /var/run/docker.sock:/var/run/docker.sock assaflavie/runlike -p nextcloud-aio-nextcloud >> /tmp/nextcloud-aio-nextcloud
sudo chown root:root /tmp/nextcloud-aio-nextcloud
```
1. Now open the file with e.g. nano: `sudo nano /tmp/nextcloud-aio-nextcloud` and change the line that should probably be `nextcloud/aio-nextcloud:latest` on x64 or `nextcloud/aio-nextcloud:latest-arm64` on arm64 to the highest compatible PHP version: E.g. `nextcloud/aio-nextcloud:php8.0-latest` on x64 or `nextcloud/aio-nextcloud:php8.0-latest-arm64` on arm64. Then save the file and close it with `[Ctrl]+[o]` -> `[Enter]` and `[Ctrl]+[x]`.
1. Now open the file with e.g. nano: `sudo nano /tmp/nextcloud-aio-nextcloud` and change the line that should probably be `nextcloud/aio-nextcloud:latest` on x64 or `nextcloud/aio-nextcloud:latest-arm64` on arm64 to the highest compatible PHP version: E.g. `nextcloud/aio-nextcloud:php8.0-latest`. Then save the file and close it with `[Ctrl]+[o]` -> `[Enter]` and `[Ctrl]+[x]`.
1. After doing so, remove the Nextcloud container with `sudo docker rm nextcloud-aio-nextcloud`.
1. Now start the Nextcloud container with the new tag by simply running `sudo bash /tmp/nextcloud-aio-nextcloud` which at startup should automatically upgrade Nextcloud to a more recent version. If not, make sure that there is no `skip.update` file in the Nextcloud datadir. If there is such a file, simply delete the file and restart the container again.<br>
**Info**: You can open the Nextcloud container logs with `sudo docker logs -f nextcloud-aio-nextcloud`.

View File

@@ -10,17 +10,17 @@ There are basically three ways how to migrate from an already existing Nextcloud
**Please note**: If you used groupfolders or encrypted your files before, you will need to restore the database, as well!
The procedure for migrating only the files works like this:
1. Take a backup of your former instance (especially from your datadirectory)
1. Take a backup of your former instance (especially from your datadirectory, see `'datadirectory'` in your `config.php`)
1. Install Nextcloud AIO on a new server/linux installation, enter your domain and wait until all containers are running
1. Recreate all users that were present on your former installation
1. Take a backup using Nextcloud AIO's built-in backup solution (so that you can easily restore to this state again) (Note: this will stop all containers and is expected: don't start the container again at this point!)
1. Restore the datadirectory of your former instance into the following directory: `/var/lib/docker/volumes/nextcloud_aio_nextcloud_data/_data/`
1. Next, run `sudo chown -R 33:0 /var/lib/docker/volumes/nextcloud_aio_nextcloud_data/_data/*` and `sudo chmod -R 750 /var/lib/docker/volumes/nextcloud_aio_nextcloud_data/_data/*` to apply the correct permissions
1. Restore the datadirectory of your former instance: for `/path/to/nextcloud/data/` run `sudo docker cp --follow-link /path/to/nextcloud/data/ nextcloud-aio-nextcloud:/mnt/ncdata/` Note: the `/` at the end are necessary.
1. Next, run `sudo docker run --rm --volume nextcloud_aio_nextcloud_data:/mnt/ncdata:rw alpine chown -R 33:0 /mnt/ncdata/` and `sudo docker run --rm --volume nextcloud_aio_nextcloud_data:/mnt/ncdata:rw alpine chmod -R 750 /mnt/ncdata/` to apply the correct permissions. (Or if `NEXTCLOUD_DATADIR` was provided, apply `chown -R 33:0` and `chmod -R 750` to the chosen path.)
1. Start the containers again and wait until all containers are running
1. Run `sudo docker exec --user www-data -it nextcloud-aio-nextcloud php occ files:scan-app-data && sudo docker exec --user www-data -it nextcloud-aio-nextcloud php occ files:scan --all` in order to scan all files in the datadirectory.
## Migrate the files and the database
**Please note**: this is much more complicated than migrating only the files and also not as failproof so be warned! Also, this will not work on former snap installations as the snap is read-only and thus you cannot install the necessary `pdo_pgsql` PHP extension.
**Please note**: this is much more complicated than migrating only the files and also not as failproof so be warned! Also, this will not work on former snap installations as the snap is read-only and thus you cannot install the necessary `pdo_pgsql` PHP extension. So if migrating from snap, you will need to use one of the other methods. However you could try to ask if the snaps maintainer could add this one small PHP extension to the snap here: https://github.com/nextcloud-snap/nextcloud-snap/issues which would allow for an easy migration.
The procedure for migrating the files and the database works like this:
1. Make sure that your old instance is on exactly the same version like the version used in Nextcloud AIO. (e.g. 23.0.0) You can find the used version here: [click here](https://github.com/nextcloud/all-in-one/search?l=Dockerfile&q=NEXTCLOUD_VERSION&type=). If not, simply upgrade your former installation to that version or wait until the version used in Nextcloud AIO got updated to the same version of your former installation or the other way around.
@@ -36,8 +36,10 @@ The procedure for migrating the files and the database works like this:
export PG_PASSWORD="my-temporary-password"
export PG_DATABASE="nextcloud_db"
sudo -u postgres psql <<END
CREATE USER $PG_USER WITH PASSWORD '$PG_PASSWORD';
CREATE USER $PG_USER WITH PASSWORD '$PG_PASSWORD' CREATEDB;
CREATE DATABASE $PG_DATABASE WITH OWNER $PG_USER TEMPLATE template0 ENCODING 'UTF8';
GRANT ALL PRIVILEGES ON DATABASE $PG_DATABASE TO $PG_USER;
GRANT ALL PRIVILEGES ON SCHEMA public TO $PG_USER;
END
```
1. Run the following command to start the conversion:
@@ -64,17 +66,18 @@ The procedure for migrating the files and the database works like this:
1. Type in `local::/your/old/datadir/` which should bring up the exact line where you need to modify the path to use the one used in Nextcloud AIO, instead.
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.
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. 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 rm /var/lib/docker/volumes/nextcloud_aio_database_dump/_data/database-dump.sql
sudo cp database-dump.sql /var/lib/docker/volumes/nextcloud_aio_database_dump/_data/
sudo chmod 777 /var/lib/docker/volumes/nextcloud_aio_database_dump/_data/database-dump.sql
sudo rm /var/lib/docker/volumes/nextcloud_aio_database_dump/_data/initial-cleanup-done
sudo docker run --rm --volume nextcloud_aio_database_dump:/mnt/data:rw alpine rm /mnt/data/database-dump.sql
sudo docker cp database-dump.sql nextcloud-aio-database:/mnt/data/
sudo docker run --rm --volume nextcloud_aio_database_dump:/mnt/data:rw alpine chmod 777 /mnt/data/database-dump.sql
sudo docker run --rm --volume nextcloud_aio_database_dump:/mnt/data:rw alpine rm /mnt/data/initial-cleanup-done
```
1. If the commands above were executed successfully, restore the datadirectory of your former instance into your datadirectory: `/var/lib/docker/volumes/nextcloud_aio_nextcloud_data/_data/`. Be aware if you have changed the standard path of your datadirectory like described [here](https://github.com/nextcloud/all-in-one#how-to-change-the-default-location-of-nextclouds-datadir).
1. Next, run `sudo chown -R 33:0 /var/lib/docker/volumes/nextcloud_aio_nextcloud_data/_data/*` and `sudo chmod -R 750 /var/lib/docker/volumes/nextcloud_aio_nextcloud_data/_data/*`to apply the correct permissions on the datadirectory.
1. Edit the Nextcloud AIO config.php file that is stored in `/var/lib/docker/volumes/nextcloud_aio_nextcloud/_data/config/config.php` and modify only `passwordsalt`, `secret`, `instanceid` and set it to the old values that you used on your old installation. If you are brave, feel free to modify further values e.g. add your old LDAP config or S3 storage config. (Some things like Mail server config can be added back using Nextcloud's webinterface later on).
1. If the commands above were executed successfully, restore the datadirectory of your former instance into your datadirectory: `sudo docker run --rm --volume nextcloud_aio_nextcloud_data:/mnt/ncdata:rw alpine sh -c "rm -rf /mnt/ncdata/*"` and `sudo docker cp --follow-link /path/to/nextcloud/data/ nextcloud-aio-nextcloud:/mnt/ncdata/` Note: the `/` at the end are necessary. (Or if `NEXTCLOUD_DATADIR` was provided, first delete the files in there and then copy the files to the chosen path.)
1. Next, run `sudo docker run --rm --volume nextcloud_aio_nextcloud_data:/mnt/ncdata:rw alpine chown -R 33:0 /mnt/ncdata/` and `sudo docker run --rm --volume nextcloud_aio_nextcloud_data:/mnt/ncdata:rw alpine chmod -R 750 /mnt/ncdata/` to apply the correct permissions on the datadirectory. (Or if `NEXTCLOUD_DATADIR` was provided, apply `chown -R 33:0` and `chmod -R 750` to the chosen path.)
1. Edit the Nextcloud AIO config.php file using `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"` and modify only `passwordsalt`, `secret`, `instanceid` and set it to the old values that you used on your old installation. If you are brave, feel free to modify further values e.g. add your old LDAP config or S3 storage config. (Some things like Mail server config can be added back using Nextcloud's webinterface later on).
1. When you are done and saved your changes to the file, finally start the containers again and wait until all containers are running.
1. As last step, install all apps again that were installed before on your old instance by using the webinterface.

View File

@@ -8,12 +8,12 @@ Below is described more in detail how the the second way works.
## Run multiple AIO instances on the same server with docker rootless
1. Create as many linux users as you need first. The easiest way is to use `sudo adduser` and follow the setup for that. Make sure to create a strong unique password for each of them and write it down!
1. Log in as each of the users e.g. by opening a new SSH connection and install docker rootless for each of them by following step 0-4 of the [docker rootless documentation](./docker-rootless.md).
1. Then install AIO in reverse proxy mode by using the command that is descriebed in step 2 and 3 of the [reverse proxy documentation](./reverse-proxy.md) but use a different `APACHE_PORT` and [`TALK_PORT`](https://github.com/nextcloud/all-in-one#how-to-adjust-the-talk-port) for each instance as otherwise it will bug out. Also make sure to adjust the docker socket and `DOCKER_SOCKET_PATH` correctly for each of them by following step 6 of the [docker rootless documentation](./docker-rootless.md). Additionally, modify `--publish 8080:8080` to a different port for each container, e.g. `8081:8080` as otherwise it will not work.<br>
1. Then install AIO in reverse proxy mode by using the command that is descriebed in step 2 and 3 of the [reverse proxy documentation](./reverse-proxy.md) but use a different `APACHE_PORT` and [`TALK_PORT`](https://github.com/nextcloud/all-in-one#how-to-adjust-the-talk-port) for each instance as otherwise it will bug out. Also make sure to adjust the docker socket and `WATCHTOWER_DOCKER_SOCKET_PATH` correctly for each of them by following step 6 of the [docker rootless documentation](./docker-rootless.md). Additionally, modify `--publish 8080:8080` to a different port for each container, e.g. `8081:8080` as otherwise it will not work.<br>
**⚠️ Please note:** If you want to adjust the `NEXTCLOUD_DATADIR`, make sure to apply the correct permissions to the chosen path as documented at the bottom of the [docker rootless documentation](./docker-rootless.md). Also for the built-in backup to work, the target path needs to have the correct permissions as documented there, too.
1. Now install your webserver of choice on the host system. It is recommended to use caddy for this as it is by far the easiest solution. You can do so by following https://caddyserver.com/docs/install#debian-ubuntu-raspbian or below. (It needs to be installed directly on the host or on a different server in the same network).
1. Next create your Caddyfile with multiple entries and domains for the different instances like described in step 1 of the [reverse proxy documentation](./reverse-proxy.md). Obviously each domain needs to point correctly to the chosen `APACHE_PORT` that you've configured before. Then start Caddy which should automatically get the needed certificates for you if your domains are configured correctly and ports 80 and 443 are forwarded to your server.
1. Now open each of the AIO interfaces by opening `https://ip.address.of.this.server:8080` or e.g. `https://ip.address.of.this.server:8081` or as chosen during step 3 of this documentation.
1. Finally type in the domain that you've configured for each of the instances during step 5 of this documentation and you are done.
1. Please also do not forget to open each chosen `TALK_PORT` UPD and TCP in your firewall/router as otherwise Talk will not work correctly!
1. Please also do not forget to open/forward each chosen `TALK_PORT` UPD and TCP in your firewall/router as otherwise Talk will not work correctly!
Now everything should be set up correctly and you should have created multiple working instances of AIO on the same server!

View File

@@ -0,0 +1,13 @@
name: nextcloud-aio-helm-chart
description: A generated Helm Chart for Nextcloud AIO from Skippbox Kompose
version: 5.1.0
apiVersion: v2
keywords:
- latest
- nextcloud
- helm-chart
- open-source
- cloud
sources:
- https://github.com/nextcloud/all-in-one/tree/main/nextcloud-aio-helm-chart
home: https://github.com/nextcloud/all-in-one/tree/main/nextcloud-aio-helm-chart

View File

@@ -0,0 +1,37 @@
# Nextcloud AIO Helm-chart
You can run the containers that are build for AIO with Kubernetes using this Helm chart. This comes with a few downsides, that are discussed below.
### Advantages
- You can run it without a container having access to the docker socket
- You can run the containers with Kubernetes
### Disadvantages
- You lose the AIO interface
- You lose update notifications and automatic updates
- You lose all AIO backup and restore features
- **You need to know what you are doing**
- For updating, you need to strictly follow the at the bottom described update routine
- You need to monitor yourself if the volumes have enough free space and increase them if they don't by adjusting their size in values.yaml
- Probably more
## How to use this?
First download this file: https://raw.githubusercontent.com/nextcloud/all-in-one/main/nextcloud-aio-helm-chart/values.yaml and adjust at least all values marked with `# TODO!`
Then run:
```
helm repo add nextcloud-aio https://nextcloud.github.io/all-in-one/
helm install my-release nextcloud-aio/nextcloud-aio-helm-chart -f values.yaml
```
And after a while, everything should be set up.
## How to update?
Since the values of this helm chart may change in the future, it is highly recommended to strictly follow the following procedure whenever you want to upgrade it.
1. Stop all running pods
1. Back up all volumes that got created by the Helm chart and the values.yaml file
1. Run `helm repo update nextcloud-aio` in order to get the updated yaml files from the repository
1. Now download the updated values.yaml file from https://raw.githubusercontent.com/nextcloud/all-in-one/main/nextcloud-aio-helm-chart/values.yaml and compare that with the one that you currently have locally. Look for variables that changed or got added. You can use the diff command to compare them.
1. After the file update was successful, simply run `helm install my-release nextcloud-aio/nextcloud-aio-helm-chart -f values.yaml` to update to the new version.

View File

@@ -0,0 +1,73 @@
apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.service: nextcloud-aio-apache
name: nextcloud-aio-apache
spec:
replicas: 1
selector:
matchLabels:
io.kompose.service: nextcloud-aio-apache
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.network/nextcloud-aio: "true"
io.kompose.service: nextcloud-aio-apache
spec:
initContainers:
- name: init-volumes
image: alpine
command:
- chmod
- "777"
- /nextcloud-aio-nextcloud
- /nextcloud-aio-apache
volumeMounts:
- name: nextcloud-aio-apache
mountPath: /nextcloud-aio-apache
- name: nextcloud-aio-nextcloud
mountPath: /nextcloud-aio-nextcloud
containers:
- env:
- name: APACHE_MAX_SIZE
value: "{{ .Values.APACHE_MAX_SIZE }}"
- name: APACHE_MAX_TIME
value: "{{ .Values.NEXTCLOUD_MAX_TIME }}"
- name: APACHE_PORT
value: "{{ .Values.APACHE_PORT }}"
- name: COLLABORA_HOST
value: nextcloud-aio-collabora
- name: NC_DOMAIN
value: "{{ .Values.NC_DOMAIN }}"
- name: NEXTCLOUD_HOST
value: nextcloud-aio-nextcloud
- name: ONLYOFFICE_HOST
value: nextcloud-aio-onlyoffice
- name: TALK_HOST
value: nextcloud-aio-talk
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-apache:20230511_075831-latest
name: nextcloud-aio-apache
ports:
- containerPort: {{ .Values.APACHE_PORT }}
volumeMounts:
- mountPath: /var/www/html
name: nextcloud-aio-nextcloud
readOnly: true
- mountPath: /mnt/data
name: nextcloud-aio-apache
volumes:
- name: nextcloud-aio-nextcloud
persistentVolumeClaim:
claimName: nextcloud-aio-nextcloud
- name: nextcloud-aio-apache
persistentVolumeClaim:
claimName: nextcloud-aio-apache

View File

@@ -0,0 +1,15 @@
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
labels:
io.kompose.service: nextcloud-aio-apache
name: nextcloud-aio-apache
spec:
{{- if .Values.STORAGE_CLASS }}
storageClassName: {{ .Values.STORAGE_CLASS }}
{{- end }}
accessModes:
- ReadWriteOnce
resources:
requests:
storage: {{ .Values.APACHE_STORAGE_SIZE }}

View File

@@ -0,0 +1,17 @@
apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.service: nextcloud-aio-apache
name: nextcloud-aio-apache
spec:
type: LoadBalancer
ports:
- name: "{{ .Values.APACHE_PORT }}"
port: {{ .Values.APACHE_PORT }}
targetPort: {{ .Values.APACHE_PORT }}
selector:
io.kompose.service: nextcloud-aio-apache

View File

@@ -0,0 +1,52 @@
{{- if eq .Values.CLAMAV_ENABLED "yes" }}
apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.service: nextcloud-aio-clamav
name: nextcloud-aio-clamav
spec:
replicas: 1
selector:
matchLabels:
io.kompose.service: nextcloud-aio-clamav
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.network/nextcloud-aio: "true"
io.kompose.service: nextcloud-aio-clamav
spec:
initContainers:
- name: init-volumes
image: alpine
command:
- chmod
- "777"
- /nextcloud-aio-clamav
volumeMounts:
- name: nextcloud-aio-clamav
mountPath: /nextcloud-aio-clamav
containers:
- env:
- name: CLAMD_STARTUP_TIMEOUT
value: "90"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-clamav:20230511_075831-latest
name: nextcloud-aio-clamav
ports:
- containerPort: 3310
volumeMounts:
- mountPath: /var/lib/clamav
name: nextcloud-aio-clamav
volumes:
- name: nextcloud-aio-clamav
persistentVolumeClaim:
claimName: nextcloud-aio-clamav
{{- end }}

View File

@@ -0,0 +1,15 @@
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
labels:
io.kompose.service: nextcloud-aio-clamav
name: nextcloud-aio-clamav
spec:
{{- if .Values.STORAGE_CLASS }}
storageClassName: {{ .Values.STORAGE_CLASS }}
{{- end }}
accessModes:
- ReadWriteOnce
resources:
requests:
storage: {{ .Values.CLAMAV_STORAGE_SIZE }}

View File

@@ -0,0 +1,18 @@
{{- if eq .Values.CLAMAV_ENABLED "yes" }}
apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.service: nextcloud-aio-clamav
name: nextcloud-aio-clamav
spec:
ports:
- name: "3310"
port: 3310
targetPort: 3310
selector:
io.kompose.service: nextcloud-aio-clamav
{{- end }}

View File

@@ -0,0 +1,60 @@
{{- if eq .Values.COLLABORA_ENABLED "yes" }}
apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.service: nextcloud-aio-collabora
name: nextcloud-aio-collabora
spec:
replicas: 1
selector:
matchLabels:
io.kompose.service: nextcloud-aio-collabora
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.network/nextcloud-aio: "true"
io.kompose.service: nextcloud-aio-collabora
spec:
initContainers:
- name: init-volumes
image: alpine
command:
- chmod
- "777"
- /nextcloud-aio-collabora-fonts
volumeMounts:
- name: nextcloud-aio-collabora-fonts
mountPath: /nextcloud-aio-collabora-fonts
containers:
- env:
- name: DONT_GEN_SSL_CERT
value: "1"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
- name: aliasgroup1
value: https://{{ .Values.NC_DOMAIN }}:443
- name: dictionaries
value: "{{ .Values.COLLABORA_DICTIONARIES }}"
- name: extra_params
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:20230511_075831-latest
name: nextcloud-aio-collabora
ports:
- containerPort: 9980
volumeMounts:
- mountPath: /opt/cool/systemplate/tmpfonts
name: nextcloud-aio-collabora-fonts
volumes:
- name: nextcloud-aio-collabora-fonts
persistentVolumeClaim:
claimName: nextcloud-aio-collabora-fonts
{{- end }}

View File

@@ -0,0 +1,15 @@
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
labels:
io.kompose.service: nextcloud-aio-collabora-fonts
name: nextcloud-aio-collabora-fonts
spec:
{{- if .Values.STORAGE_CLASS }}
storageClassName: {{ .Values.STORAGE_CLASS }}
{{- end }}
accessModes:
- ReadWriteOnce
resources:
requests:
storage: {{ .Values.COLLABORA_FONTS_STORAGE_SIZE }}

View File

@@ -0,0 +1,18 @@
{{- if eq .Values.COLLABORA_ENABLED "yes" }}
apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.service: nextcloud-aio-collabora
name: nextcloud-aio-collabora
spec:
ports:
- name: "9980"
port: 9980
targetPort: 9980
selector:
io.kompose.service: nextcloud-aio-collabora
{{- end }}

View File

@@ -0,0 +1,80 @@
apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.service: nextcloud-aio-database
name: nextcloud-aio-database
spec:
replicas: 1
selector:
matchLabels:
io.kompose.service: nextcloud-aio-database
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.network/nextcloud-aio: "true"
io.kompose.service: nextcloud-aio-database
spec:
initContainers:
- name: init-subpath
image: alpine
command:
- mkdir
- "-p"
- /nextcloud-aio-database/data
- /nextcloud-aio-database
- /nextcloud-aio-database-dump
volumeMounts:
- name: nextcloud-aio-database-dump
mountPath: /nextcloud-aio-database-dump
- name: nextcloud-aio-database
mountPath: /nextcloud-aio-database
- name: init-volumes
image: alpine
command:
- chown
- 999:999
- "-R"
- /nextcloud-aio-database
- /nextcloud-aio-database-dump
volumeMounts:
- name: nextcloud-aio-database-dump
mountPath: /nextcloud-aio-database-dump
- name: nextcloud-aio-database
mountPath: /nextcloud-aio-database
containers:
- env:
- name: PGTZ
value: "{{ .Values.TIMEZONE }}"
- name: POSTGRES_DB
value: nextcloud_database
- name: POSTGRES_PASSWORD
value: "{{ .Values.DATABASE_PASSWORD }}"
- name: POSTGRES_USER
value: nextcloud
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-postgresql:20230511_075831-latest
name: nextcloud-aio-database
ports:
- containerPort: 5432
volumeMounts:
- mountPath: /var/lib/postgresql/data
subPath: data
name: nextcloud-aio-database
- mountPath: /mnt/data
name: nextcloud-aio-database-dump
terminationGracePeriodSeconds: 1800
volumes:
- name: nextcloud-aio-database
persistentVolumeClaim:
claimName: nextcloud-aio-database
- name: nextcloud-aio-database-dump
persistentVolumeClaim:
claimName: nextcloud-aio-database-dump

View File

@@ -0,0 +1,15 @@
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
labels:
io.kompose.service: nextcloud-aio-database-dump
name: nextcloud-aio-database-dump
spec:
{{- if .Values.STORAGE_CLASS }}
storageClassName: {{ .Values.STORAGE_CLASS }}
{{- end }}
accessModes:
- ReadWriteOnce
resources:
requests:
storage: {{ .Values.DATABASE_DUMP_STORAGE_SIZE }}

View File

@@ -0,0 +1,15 @@
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
labels:
io.kompose.service: nextcloud-aio-database
name: nextcloud-aio-database
spec:
{{- if .Values.STORAGE_CLASS }}
storageClassName: {{ .Values.STORAGE_CLASS }}
{{- end }}
accessModes:
- ReadWriteOnce
resources:
requests:
storage: {{ .Values.DATABASE_STORAGE_SIZE }}

View File

@@ -0,0 +1,16 @@
apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.service: nextcloud-aio-database
name: nextcloud-aio-database
spec:
ports:
- name: "5432"
port: 5432
targetPort: 5432
selector:
io.kompose.service: nextcloud-aio-database

View File

@@ -0,0 +1,15 @@
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
labels:
io.kompose.service: nextcloud-aio-elasticsearch
name: nextcloud-aio-elasticsearch
spec:
{{- if .Values.STORAGE_CLASS }}
storageClassName: {{ .Values.STORAGE_CLASS }}
{{- end }}
accessModes:
- ReadWriteOnce
resources:
requests:
storage: {{ .Values.ELASTICSEARCH_STORAGE_SIZE }}

View File

@@ -0,0 +1,56 @@
{{- if eq .Values.FULLTEXTSEARCH_ENABLED "yes" }}
apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.service: nextcloud-aio-fulltextsearch
name: nextcloud-aio-fulltextsearch
spec:
replicas: 1
selector:
matchLabels:
io.kompose.service: nextcloud-aio-fulltextsearch
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.network/nextcloud-aio: "true"
io.kompose.service: nextcloud-aio-fulltextsearch
spec:
initContainers:
- name: init-volumes
image: alpine
command:
- chmod
- "777"
- /nextcloud-aio-elasticsearch
volumeMounts:
- name: nextcloud-aio-elasticsearch
mountPath: /nextcloud-aio-elasticsearch
containers:
- env:
- name: ES_JAVA_OPTS
value: -Xms1024M -Xmx1024M
- name: POSTGRES_HOST
value: nextcloud-aio-database
- name: TZ
value: "{{ .Values.TIMEZONE }}"
- name: discovery.type
value: single-node
image: nextcloud/aio-fulltextsearch:20230511_075831-latest
name: nextcloud-aio-fulltextsearch
ports:
- containerPort: 9200
volumeMounts:
- mountPath: /usr/share/elasticsearch/data
name: nextcloud-aio-elasticsearch
volumes:
- name: nextcloud-aio-elasticsearch
persistentVolumeClaim:
claimName: nextcloud-aio-elasticsearch
{{- end }}

View File

@@ -0,0 +1,18 @@
{{- if eq .Values.FULLTEXTSEARCH_ENABLED "yes" }}
apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.service: nextcloud-aio-fulltextsearch
name: nextcloud-aio-fulltextsearch
spec:
ports:
- name: "9200"
port: 9200
targetPort: 9200
selector:
io.kompose.service: nextcloud-aio-fulltextsearch
{{- end }}

View File

@@ -0,0 +1,37 @@
{{- if eq .Values.IMAGINARY_ENABLED "yes" }}
apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.service: nextcloud-aio-imaginary
name: nextcloud-aio-imaginary
spec:
replicas: 1
selector:
matchLabels:
io.kompose.service: nextcloud-aio-imaginary
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.network/nextcloud-aio: "true"
io.kompose.service: nextcloud-aio-imaginary
spec:
containers:
- env:
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-imaginary:20230511_075831-latest
name: nextcloud-aio-imaginary
ports:
- containerPort: 9000
securityContext:
capabilities:
add:
- SYS_NICE
{{- end }}

View File

@@ -0,0 +1,18 @@
{{- if eq .Values.IMAGINARY_ENABLED "yes" }}
apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.service: nextcloud-aio-imaginary
name: nextcloud-aio-imaginary
spec:
ports:
- name: "9000"
port: 9000
targetPort: 9000
selector:
io.kompose.service: nextcloud-aio-imaginary
{{- end }}

View File

@@ -0,0 +1,13 @@
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: nextcloud-aio
spec:
ingress:
- from:
- podSelector:
matchLabels:
io.kompose.network/nextcloud-aio: "true"
podSelector:
matchLabels:
io.kompose.network/nextcloud-aio: "true"

View File

@@ -0,0 +1,15 @@
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
labels:
io.kompose.service: nextcloud-aio-nextcloud-data
name: nextcloud-aio-nextcloud-data
spec:
{{- if .Values.STORAGE_CLASS }}
storageClassName: {{ .Values.STORAGE_CLASS }}
{{- end }}
accessModes:
- ReadWriteOnce
resources:
requests:
storage: {{ .Values.NEXTCLOUD_DATA_STORAGE_SIZE }}

View File

@@ -0,0 +1,139 @@
apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.service: nextcloud-aio-nextcloud
name: nextcloud-aio-nextcloud
spec:
replicas: 1
selector:
matchLabels:
io.kompose.service: nextcloud-aio-nextcloud
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.network/nextcloud-aio: "true"
io.kompose.service: nextcloud-aio-nextcloud
spec:
initContainers:
- name: init-volumes
image: alpine
command:
- chmod
- "777"
- /nextcloud-aio-nextcloud
- /nextcloud-aio-nextcloud-trusted-cacerts
volumeMounts:
- name: nextcloud-aio-nextcloud-trusted-cacerts
mountPath: /nextcloud-aio-nextcloud-trusted-cacerts
- name: nextcloud-aio-nextcloud
mountPath: /nextcloud-aio-nextcloud
containers:
- env:
- name: ADDITIONAL_APKS
value: "{{ .Values.NEXTCLOUD_ADDITIONAL_APKS }}"
- name: ADDITIONAL_PHP_EXTENSIONS
value: "{{ .Values.NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS }}"
- name: ADMIN_PASSWORD
value: "{{ .Values.NEXTCLOUD_PASSWORD }}"
- name: ADMIN_USER
value: admin
- name: AIO_TOKEN
value: "{{ .Values.AIO_TOKEN }}"
- name: AIO_URL
value: "{{ .Values.AIO_URL }}"
- name: CLAMAV_ENABLED
value: "{{ .Values.CLAMAV_ENABLED }}"
- name: CLAMAV_HOST
value: nextcloud-aio-clamav
- name: COLLABORA_ENABLED
value: "{{ .Values.COLLABORA_ENABLED }}"
- name: COLLABORA_HOST
value: nextcloud-aio-collabora
- name: FULLTEXTSEARCH_ENABLED
value: "{{ .Values.FULLTEXTSEARCH_ENABLED }}"
- name: FULLTEXTSEARCH_HOST
value: nextcloud-aio-fulltextsearch
- name: IMAGINARY_ENABLED
value: "{{ .Values.IMAGINARY_ENABLED }}"
- name: IMAGINARY_HOST
value: nextcloud-aio-imaginary
- name: INSTALL_LATEST_MAJOR
value: "{{ .Values.INSTALL_LATEST_MAJOR }}"
- name: NC_DOMAIN
value: "{{ .Values.NC_DOMAIN }}"
- name: NEXTCLOUD_DATA_DIR
value: /mnt/ncdata
- name: ONLYOFFICE_ENABLED
value: "{{ .Values.ONLYOFFICE_ENABLED }}"
- name: ONLYOFFICE_HOST
value: nextcloud-aio-onlyoffice
- name: ONLYOFFICE_SECRET
value: "{{ .Values.ONLYOFFICE_SECRET }}"
- name: OVERWRITEHOST
value: "{{ .Values.NC_DOMAIN }}"
- name: OVERWRITEPROTOCOL
value: https
- name: PHP_MAX_TIME
value: "{{ .Values.NEXTCLOUD_MAX_TIME }}"
- name: PHP_MEMORY_LIMIT
value: "{{ .Values.NEXTCLOUD_MEMORY_LIMIT }}"
- name: PHP_UPLOAD_LIMIT
value: "{{ .Values.NEXTCLOUD_UPLOAD_LIMIT }}"
- name: POSTGRES_DB
value: nextcloud_database
- name: POSTGRES_HOST
value: nextcloud-aio-database
- name: POSTGRES_PASSWORD
value: "{{ .Values.DATABASE_PASSWORD }}"
- name: POSTGRES_USER
value: nextcloud
- name: REDIS_HOST
value: nextcloud-aio-redis
- name: REDIS_HOST_PASSWORD
value: "{{ .Values.REDIS_PASSWORD }}"
- name: SIGNALING_SECRET
value: "{{ .Values.SIGNALING_SECRET }}"
- name: STARTUP_APPS
value: "{{ .Values.NEXTCLOUD_STARTUP_APPS }}"
- name: TALK_ENABLED
value: "{{ .Values.TALK_ENABLED }}"
- name: TALK_PORT
value: "{{ .Values.TALK_PORT }}"
- name: TRUSTED_CACERTS_DIR
value: "{{ .Values.NEXTCLOUD_TRUSTED_CACERTS_DIR }}"
- name: TURN_SECRET
value: "{{ .Values.TURN_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
- name: UPDATE_NEXTCLOUD_APPS
value: "{{ .Values.UPDATE_NEXTCLOUD_APPS }}"
image: nextcloud/aio-nextcloud:20230511_075831-latest
name: nextcloud-aio-nextcloud
ports:
- containerPort: 9000
- containerPort: 7867
volumeMounts:
- mountPath: /var/www/html
name: nextcloud-aio-nextcloud
- mountPath: /mnt/ncdata
name: nextcloud-aio-nextcloud-data
- mountPath: /usr/local/share/ca-certificates
name: nextcloud-aio-nextcloud-trusted-cacerts
readOnly: true
volumes:
- name: nextcloud-aio-nextcloud
persistentVolumeClaim:
claimName: nextcloud-aio-nextcloud
- name: nextcloud-aio-nextcloud-data
persistentVolumeClaim:
claimName: nextcloud-aio-nextcloud-data
- name: nextcloud-aio-nextcloud-trusted-cacerts
persistentVolumeClaim:
claimName: nextcloud-aio-nextcloud-trusted-cacerts

View File

@@ -0,0 +1,15 @@
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
labels:
io.kompose.service: nextcloud-aio-nextcloud
name: nextcloud-aio-nextcloud
spec:
{{- if .Values.STORAGE_CLASS }}
storageClassName: {{ .Values.STORAGE_CLASS }}
{{- end }}
accessModes:
- ReadWriteOnce
resources:
requests:
storage: {{ .Values.NEXTCLOUD_STORAGE_SIZE }}

View File

@@ -0,0 +1,19 @@
apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.service: nextcloud-aio-nextcloud
name: nextcloud-aio-nextcloud
spec:
ports:
- name: "9000"
port: 9000
targetPort: 9000
- name: "7867"
port: 7867
targetPort: 7867
selector:
io.kompose.service: nextcloud-aio-nextcloud

View File

@@ -0,0 +1,15 @@
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
labels:
io.kompose.service: nextcloud-aio-nextcloud-trusted-cacerts
name: nextcloud-aio-nextcloud-trusted-cacerts
spec:
{{- if .Values.STORAGE_CLASS }}
storageClassName: {{ .Values.STORAGE_CLASS }}
{{- end }}
accessModes:
- ReadWriteOnce
resources:
requests:
storage: {{ .Values.NEXTCLOUD_TRUSTED_CACERTS_STORAGE_SIZE }}

View File

@@ -0,0 +1,56 @@
{{- if eq .Values.ONLYOFFICE_ENABLED "yes" }}
apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.service: nextcloud-aio-onlyoffice
name: nextcloud-aio-onlyoffice
spec:
replicas: 1
selector:
matchLabels:
io.kompose.service: nextcloud-aio-onlyoffice
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.network/nextcloud-aio: "true"
io.kompose.service: nextcloud-aio-onlyoffice
spec:
initContainers:
- name: init-volumes
image: alpine
command:
- chmod
- "777"
- /nextcloud-aio-onlyoffice
volumeMounts:
- name: nextcloud-aio-onlyoffice
mountPath: /nextcloud-aio-onlyoffice
containers:
- env:
- name: JWT_ENABLED
value: "true"
- name: JWT_HEADER
value: AuthorizationJwt
- name: JWT_SECRET
value: "{{ .Values.ONLYOFFICE_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-onlyoffice:20230511_075831-latest
name: nextcloud-aio-onlyoffice
ports:
- containerPort: 80
volumeMounts:
- mountPath: /var/lib/onlyoffice
name: nextcloud-aio-onlyoffice
volumes:
- name: nextcloud-aio-onlyoffice
persistentVolumeClaim:
claimName: nextcloud-aio-onlyoffice
{{- end }}

View File

@@ -0,0 +1,15 @@
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
labels:
io.kompose.service: nextcloud-aio-onlyoffice
name: nextcloud-aio-onlyoffice
spec:
{{- if .Values.STORAGE_CLASS }}
storageClassName: {{ .Values.STORAGE_CLASS }}
{{- end }}
accessModes:
- ReadWriteOnce
resources:
requests:
storage: {{ .Values.ONLYOFFICE_STORAGE_SIZE }}

View File

@@ -0,0 +1,18 @@
{{- if eq .Values.ONLYOFFICE_ENABLED "yes" }}
apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.service: nextcloud-aio-onlyoffice
name: nextcloud-aio-onlyoffice
spec:
ports:
- name: "80"
port: 80
targetPort: 80
selector:
io.kompose.service: nextcloud-aio-onlyoffice
{{- end }}

View File

@@ -0,0 +1,50 @@
apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.service: nextcloud-aio-redis
name: nextcloud-aio-redis
spec:
replicas: 1
selector:
matchLabels:
io.kompose.service: nextcloud-aio-redis
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.network/nextcloud-aio: "true"
io.kompose.service: nextcloud-aio-redis
spec:
initContainers:
- name: init-volumes
image: alpine
command:
- chmod
- "777"
- /nextcloud-aio-redis
volumeMounts:
- name: nextcloud-aio-redis
mountPath: /nextcloud-aio-redis
containers:
- env:
- name: REDIS_HOST_PASSWORD
value: "{{ .Values.REDIS_PASSWORD }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-redis:20230511_075831-latest
name: nextcloud-aio-redis
ports:
- containerPort: 6379
volumeMounts:
- mountPath: /data
name: nextcloud-aio-redis
volumes:
- name: nextcloud-aio-redis
persistentVolumeClaim:
claimName: nextcloud-aio-redis

View File

@@ -0,0 +1,15 @@
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
labels:
io.kompose.service: nextcloud-aio-redis
name: nextcloud-aio-redis
spec:
{{- if .Values.STORAGE_CLASS }}
storageClassName: {{ .Values.STORAGE_CLASS }}
{{- end }}
accessModes:
- ReadWriteOnce
resources:
requests:
storage: {{ .Values.REDIS_STORAGE_SIZE }}

View File

@@ -0,0 +1,16 @@
apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.service: nextcloud-aio-redis
name: nextcloud-aio-redis
spec:
ports:
- name: "6379"
port: 6379
targetPort: 6379
selector:
io.kompose.service: nextcloud-aio-redis

View File

@@ -0,0 +1,44 @@
{{- if eq .Values.TALK_ENABLED "yes" }}
apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.service: nextcloud-aio-talk
name: nextcloud-aio-talk
spec:
replicas: 1
selector:
matchLabels:
io.kompose.service: nextcloud-aio-talk
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
labels:
io.kompose.network/nextcloud-aio: "true"
io.kompose.service: nextcloud-aio-talk
spec:
containers:
- env:
- name: NC_DOMAIN
value: "{{ .Values.NC_DOMAIN }}"
- name: SIGNALING_SECRET
value: "{{ .Values.SIGNALING_SECRET }}"
- name: TALK_PORT
value: "{{ .Values.TALK_PORT }}"
- name: TURN_SECRET
value: "{{ .Values.TURN_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-talk:20230511_075831-latest
name: nextcloud-aio-talk
ports:
- containerPort: {{ .Values.TALK_PORT }}
- containerPort: {{ .Values.TALK_PORT }}
protocol: UDP
- containerPort: 8081
{{- end }}

Some files were not shown because too many files have changed in this diff Show More