Compare commits

...

53 Commits

Author SHA1 Message Date
Simon L.
ef1e7c28f6 fix it
Signed-off-by: Simon L. <szaimen@e.mail.de>
2024-07-11 17:28:25 +02:00
Simon L.
f90971ef9d another attempt
Signed-off-by: Simon L. <szaimen@e.mail.de>
2024-07-11 17:24:59 +02:00
Simon L.
efca35b0e9 try to fix it
Signed-off-by: Simon L. <szaimen@e.mail.de>
2024-07-11 17:07:14 +02:00
Simon L.
f72ab28a41 fix clamav
Signed-off-by: Simon L. <szaimen@e.mail.de>
2024-07-11 15:54:25 +02:00
Simon L
504ae2d617 Merge pull request #4971 from nextcloud/ernolf/imaginary-fix
get rid of "some font thing failed" error messages
2024-07-11 15:23:19 +02:00
Simon L.
b2d373cd7f increase to v9.2.0
Signed-off-by: Simon L. <szaimen@e.mail.de>
2024-07-11 15:07:39 +02:00
Simon L
fdc5e87a01 Merge pull request #4960 from nextcloud/enh/4918/fix-clamav
clamav - adjust max filesize conditionally
2024-07-11 15:05:44 +02:00
ernolf
002c9a8fc2 get rid of "some font thing failed" error messages
Signed-off-by: ernolf <raphael.gradenwitz@googlemail.com>
2024-07-11 15:00:33 +02:00
Simon L
d304c791ff Merge pull request #4912 from nextcloud/no-listen
Implement internal mode
2024-07-11 14:58:29 +02:00
Simon L.
789c9abcd2 fix SC
Signed-off-by: Simon L. <szaimen@e.mail.de>
2024-07-11 14:30:56 +02:00
Simon L.
c69aa56349 revert changes to reverse-proxy.md
Signed-off-by: Simon L. <szaimen@e.mail.de>
2024-07-11 14:27:27 +02:00
Simon L.
3cdb855df3 set apache_ip_binding to internal for caddy community container and remove legacy code
Signed-off-by: Simon L. <szaimen@e.mail.de>
2024-07-11 14:26:08 +02:00
Simon L.
66dc0bc7d6 clamav - adjust max filesize conditionally
Signed-off-by: Simon L. <szaimen@e.mail.de>
2024-07-11 14:07:32 +02:00
Simon L.
6463df73e6 Revert "keep /root/.bashrc"
This reverts commit ed1de79e9b.
2024-07-10 18:01:54 +02:00
Simon L.
ed1de79e9b keep /root/.bashrc
Signed-off-by: Simon L. <szaimen@e.mail.de>
2024-07-10 17:59:56 +02:00
Simon L
01fbe3dbc9 Merge pull request #4964 from nextcloud/enh/noid/fix-allowlist
nextcloud: fix APPS_ALLOWLIST
2024-07-10 17:45:06 +02:00
Simon L.
03cb72116e nextcloud: fix APPS_ALLOWLIST
Signed-off-by: Simon L. <szaimen@e.mail.de>
2024-07-10 16:24:35 +02:00
Simon L
3348849792 Merge pull request #4959 from nextcloud/dependabot/docker/Containers/collabora/collabora/code-24.04.5.1.1
build(deps): bump collabora/code from 24.04.4.2.1 to 24.04.5.1.1 in /Containers/collabora
2024-07-09 15:48:02 +02:00
Simon L
5e12c266df Merge pull request #4958 from nextcloud/dependabot/docker/Containers/fulltextsearch/elasticsearch-8.14.2
build(deps): bump elasticsearch from 8.14.1 to 8.14.2 in /Containers/fulltextsearch
2024-07-09 15:47:50 +02:00
Jean-Yves
c8d461a061 Update reverse-proxy.md
add sample for @INTERNAL

Signed-off-by: Jean-Yves <7360784+docjyJ@users.noreply.github.com>
2024-07-09 15:06:58 +02:00
dependabot[bot]
017e1ee23d build(deps): bump collabora/code in /Containers/collabora
Bumps collabora/code from 24.04.4.2.1 to 24.04.5.1.1.

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-09 12:46:14 +00:00
dependabot[bot]
95a1ed0bba build(deps): bump elasticsearch in /Containers/fulltextsearch
Bumps elasticsearch from 8.14.1 to 8.14.2.

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-09 12:43:59 +00:00
Simon L
3a691aa9a2 Merge pull request #4957 from LinuxSpielKind/patch-1
Update reverse-proxy.md
2024-07-09 14:32:49 +02:00
David
5e320a7b88 Update reverse-proxy.md
Users running AIO on Ubuntu Jammy may face blocked web socket traffic trough Apache, since rewrites with "?" are deemed unsafe. A error like this can be found in the error logs: "[rewrite:error] [pid396674] [client 192.168.xxx.yyy:57444] AH: Unsafe URL with %3f URL rewritten without UnsafeAllow3F"
The rewrite rule UnsafeAllow3F is fixing this issue.
Infos on that flag can be found here: https://httpd.apache.org/docs/current/rewrite/flags.html#flag_unsafe_allow_3f


Signed-off-by: David <142408439+LinuxSpielKind@users.noreply.github.com>
2024-07-09 12:29:54 +02:00
Simon L
bf29c8578a Merge pull request #4939 from kurt-mcrae/patch-1
Correct wording in containers.twig
2024-07-09 12:08:30 +02:00
Simon L
abe97c87c1 Merge pull request #4924 from nextcloud/dependabot/docker/Containers/talk/strukturag/nextcloud-spreed-signaling-1.3.2
build(deps): bump strukturag/nextcloud-spreed-signaling from 1.3.1 to 1.3.2 in /Containers/talk
2024-07-09 12:07:11 +02:00
Simon L
f1dc400e81 Merge pull request #4926 from nextcloud/dependabot/docker/Containers/mastercontainer/docker-27.0.3-cli
build(deps): bump docker from 27.0.2-cli to 27.0.3-cli in /Containers/mastercontainer
2024-07-09 12:06:47 +02:00
dependabot[bot]
f29e66c1b4 build(deps): bump docker in /Containers/mastercontainer
Bumps docker from 27.0.2-cli to 27.0.3-cli.

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-09 10:05:47 +00:00
Simon L
74f84bac78 Merge pull request #4933 from nextcloud/dependabot/docker/Containers/imaginary/golang-1.22.5-alpine3.20
build(deps): bump golang from 1.22.4-alpine3.20 to 1.22.5-alpine3.20 in /Containers/imaginary
2024-07-09 12:05:46 +02:00
Simon L
7548790041 Merge pull request #4934 from nextcloud/dependabot/docker/Containers/apache/httpd-2.4.61-alpine3.20
build(deps): bump httpd from 2.4.59-alpine3.20 to 2.4.61-alpine3.20 in /Containers/apache
2024-07-09 12:05:36 +02:00
Simon L
66bbe0dbb8 Merge pull request #4952 from nextcloud/dependabot/docker/Containers/clamav/clamav/clamav-1.3.1-59
build(deps): bump clamav/clamav from 1.3.1-58 to 1.3.1-59 in /Containers/clamav
2024-07-09 12:04:43 +02:00
Simon L
17f19c5d75 Merge pull request #4953 from nextcloud/dependabot/docker/Containers/nextcloud/php-8.2.21-fpm-alpine3.20
build(deps): bump php from 8.2.20-fpm-alpine3.20 to 8.2.21-fpm-alpine3.20 in /Containers/nextcloud
2024-07-09 12:04:30 +02:00
Simon L
5a67944315 Merge pull request #4954 from nextcloud/dependabot/docker/Containers/mastercontainer/php-8.3.9-fpm-alpine3.20
build(deps): bump php from 8.3.8-fpm-alpine3.20 to 8.3.9-fpm-alpine3.20 in /Containers/mastercontainer
2024-07-09 12:04:16 +02:00
dependabot[bot]
d727f11102 build(deps): bump php in /Containers/mastercontainer
Bumps php from 8.3.8-fpm-alpine3.20 to 8.3.9-fpm-alpine3.20.

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-08 13:00:39 +00:00
dependabot[bot]
75e5fa84ce build(deps): bump php in /Containers/nextcloud
Bumps php from 8.2.20-fpm-alpine3.20 to 8.2.21-fpm-alpine3.20.

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-08 12:40:56 +00:00
dependabot[bot]
52fd04640d build(deps): bump clamav/clamav in /Containers/clamav
Bumps clamav/clamav from 1.3.1-58 to 1.3.1-59.

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-08 12:10:29 +00:00
kurt-mcrae
b8bb08cf3b Correct wording in containers.twig
Signed-off-by: kurt-mcrae <83569406+kurt-mcrae@users.noreply.github.com>
2024-07-05 09:23:49 +10:00
dependabot[bot]
6fb4b3479e build(deps): bump httpd in /Containers/apache
Bumps httpd from 2.4.59-alpine3.20 to 2.4.61-alpine3.20.

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-04 12:25:34 +00:00
dependabot[bot]
a98e89b5c9 build(deps): bump golang in /Containers/imaginary
Bumps golang from 1.22.4-alpine3.20 to 1.22.5-alpine3.20.

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-04 12:15:03 +00:00
dependabot[bot]
83c24156bc build(deps): bump strukturag/nextcloud-spreed-signaling
Bumps strukturag/nextcloud-spreed-signaling from 1.3.1 to 1.3.2.

---
updated-dependencies:
- dependency-name: strukturag/nextcloud-spreed-signaling
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-02 12:06:49 +00:00
Jean-Yves
b3977ed1c8 Update start.sh
Signed-off-by: Jean-Yves <7360784+docjyJ@users.noreply.github.com>
2024-07-01 20:28:35 +02:00
Simon L
52cb90a802 Merge pull request #4919 from nextcloud/dependabot/docker/Containers/clamav/clamav/clamav-1.3.1-58
build(deps): bump clamav/clamav from 1.3.1-57 to 1.3.1-58 in /Containers/clamav
2024-07-01 15:04:18 +02:00
dependabot[bot]
9dfdfbf27b build(deps): bump clamav/clamav in /Containers/clamav
Bumps clamav/clamav from 1.3.1-57 to 1.3.1-58.

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-01 12:37:18 +00:00
Simon L
64a30cdc0e Merge pull request #4917 from nextcloud/aio-helm-update
Helm Chart updates
2024-07-01 11:23:47 +02:00
szaimen
f19579a4bc Helm Chart updates
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2024-07-01 09:21:42 +00:00
Simon L
3c8cb2bdb2 Merge pull request #4905 from nextcloud/dependabot/docker/Containers/talk/nats-2.10.17-scratch
build(deps): bump nats from 2.10.16-scratch to 2.10.17-scratch in /Containers/talk
2024-07-01 09:50:38 +02:00
Simon L
9d4055c86d Merge pull request #4903 from nextcloud/dependabot/docker/Containers/mastercontainer/docker-27.0.2-cli
build(deps): bump docker from 26.1.4-cli to 27.0.2-cli in /Containers/mastercontainer
2024-07-01 09:49:41 +02:00
Jean-Yves
571edd4bb4 Implement internal mode
Signed-off-by: Jean-Yves <7360784+docjyJ@users.noreply.github.com>
2024-06-29 19:23:26 +02:00
dependabot[bot]
05a7b1ebf5 build(deps): bump nats in /Containers/talk
Bumps nats from 2.10.16-scratch to 2.10.17-scratch.

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-28 12:39:25 +00:00
Simon L
b37be48348 Merge pull request #4715 from yannik-b/main
Add documentation not to use @ or : in passwords
2024-06-27 16:52:16 +02:00
dependabot[bot]
8a6b6f4295 build(deps): bump docker in /Containers/mastercontainer
Bumps docker from 26.1.4-cli to 27.0.2-cli.

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-27 12:40:33 +00:00
Simon L.
225442c13c improve formatting
Signed-off-by: Simon L. <szaimen@e.mail.de>
2024-06-27 12:22:12 +02:00
Yannik Buerkle
0d572bce06 add documentation not to use @ or : in passwords 2024-05-25 22:30:26 +02:00
58 changed files with 69 additions and 49 deletions

View File

@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:latest
FROM caddy:2.8.4-alpine AS caddy
FROM httpd:2.4.59-alpine3.20
FROM httpd:2.4.61-alpine3.20
COPY --from=caddy /usr/bin/caddy /usr/bin/caddy

View File

@@ -1,20 +1,26 @@
# syntax=docker/dockerfile:latest
# Probably from this file: https://github.com/Cisco-Talos/clamav-docker/blob/main/clamav/1.1/alpine/Dockerfile
FROM clamav/clamav:1.3.1-57
# Probably from this file: https://github.com/Cisco-Talos/clamav-docker/blob/main/clamav/1.3/alpine/Dockerfile
FROM clamav/clamav:1.3.1-59
COPY clamav.conf /tmp/clamav.conf
COPY clamav.conf /clamav.conf
COPY --chmod=775 start.script /start.script
RUN set -ex; \
apk upgrade --no-cache -a; \
apk add --no-cache tzdata; \
cat /tmp/clamav.conf >> /etc/clamav/clamd.conf; \
rm /tmp/clamav.conf; \
apk add --no-cache tzdata bash; \
mkdir -p /var/run/clamav /run/lock; \
chown -R clamav:clamav /var/run/clamav /run/clamav /var/log/clamav /var/lock /run/lock; \
chmod 777 -R /var/run/clamav /run/clamav /var/log/clamav /var/lock /run/lock /tmp
chmod 777 -R /var/run/clamav /run/clamav /var/log/clamav /var/lock /run/lock /tmp; \
sed -i "/^set -eu/r /start.script" /init-unprivileged; \
rm /start.script; \
grep -q 'clamd --foreground &' /init-unprivileged; \
sed -i "s|clamd --foreground \&|clamd --foreground --config-file /tmp/clamd.conf \&|" /init-unprivileged; \
cat /init-unprivileged
VOLUME /var/lib/clamav
USER clamav
LABEL com.centurylinklabs.watchtower.enable="false"
ENTRYPOINT ["/init-unprivileged"]

View File

@@ -1,4 +1,5 @@
# AIO settings
MaxDirectoryRecursion 30
MaxFileSize 100M
PCREMaxFileSize 100M
StreamMaxLength 100M
MaxFileSize 10G
PCREMaxFileSize 10G
StreamMaxLength 10G

View File

@@ -0,0 +1,4 @@
# Adjust settings
cat /etc/clamav/clamd.conf > /tmp/clamd.conf
CLAMAV_FILE="$(sed "s|10G|$MAX_SIZE|" /clamav.conf)"
echo "$CLAMAV_FILE" >> /tmp/clamd.conf

View File

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

View File

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

View File

@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:latest
FROM golang:1.22.4-alpine3.20 AS go
FROM golang:1.22.5-alpine3.20 AS go
ENV IMAGINARY_HASH=6cd9edd1d3fb151eb773c14552886e4fc8e50138
ENV IMAGINARY_HASH=6cd9edd1d3fb151eb773c14552886e4fc8e50138
RUN set -ex; \
apk add --no-cache \
@@ -25,6 +25,7 @@ RUN set -ex; \
vips-heif \
vips-jxl \
vips-poppler \
ttf-dejavu \
bash
COPY --from=go /go/bin/imaginary /usr/local/bin/imaginary

View File

@@ -1,12 +1,12 @@
# syntax=docker/dockerfile:latest
# Docker CLI is a requirement
FROM docker:26.1.4-cli AS docker
FROM docker:27.0.3-cli AS docker
# Caddy is a requirement
FROM caddy:2.8.4-alpine AS caddy
# From https://github.com/docker-library/php/blob/master/8.3/alpine3.20/fpm/Dockerfile
FROM php:8.3.8-fpm-alpine3.20
FROM php:8.3.9-fpm-alpine3.20
EXPOSE 80
EXPOSE 8080

View File

@@ -180,7 +180,7 @@ It is set to '$APACHE_PORT'."
fi
fi
if [ -n "$APACHE_IP_BINDING" ]; then
if ! echo "$APACHE_IP_BINDING" | grep -q '^[0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+$\|^[0-9a-f:]\+$'; then
if ! echo "$APACHE_IP_BINDING" | grep -q '^[0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+$\|^[0-9a-f:]\+$\|^@INTERNAL$'; then
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

View File

@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:latest
FROM php:8.2.20-fpm-alpine3.20
FROM php:8.2.21-fpm-alpine3.20
ENV PHP_MEMORY_LIMIT=512M
ENV PHP_UPLOAD_LIMIT=10G

View File

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

View File

@@ -733,8 +733,8 @@ if [ "$CLAMAV_ENABLED" = 'yes' ]; then
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="104857600"
php /var/www/html/occ config:app:set files_antivirus av_stream_max_length --value="$CLAMAV_MAX_SIZE"
php /var/www/html/occ config:app:set files_antivirus av_max_file_size --value="$CLAMAV_MAX_SIZE"
php /var/www/html/occ config:app:set files_antivirus av_infected_action --value="only_log"
fi
else

View File

@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:latest
FROM nats:2.10.16-scratch AS nats
FROM nats:2.10.17-scratch AS nats
FROM eturnal/eturnal:1.12.0 AS eturnal
FROM strukturag/nextcloud-spreed-signaling:1.3.1 AS signaling
FROM strukturag/nextcloud-spreed-signaling:1.3.2 AS signaling
FROM alpine:3.20.1 AS janus
ARG JANUS_VERSION=v0.14.3

View File

@@ -38,7 +38,7 @@
}
],
"aio_variables": [
"apache_ip_binding=127.0.0.1",
"apache_ip_binding=@INTERNAL",
"apache_port=11000"
],
"nextcloud_exec_commands": [

View File

@@ -22,7 +22,8 @@ First, install docker and docker-compose (v2) if not already done. Then simply r
git clone https://github.com/nextcloud/all-in-one.git
cd all-in-one/manual-install
```
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).
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).<br>
⚠️ **Warning**: Do not use the symbols `@` and `:` in your passwords. These symbols are used to build database connection strings. You will experience issues when using these symbols!
Now copy the provided yaml file to a compose.yaml file by running `cp latest.yml compose.yaml`.

2
nextcloud-aio-helm-chart/Chart.yaml Normal file → Executable file
View File

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

3
nextcloud-aio-helm-chart/readme.md Normal file → Executable file
View File

@@ -18,7 +18,8 @@ You can run the containers that are build for AIO with Kubernetes using this Hel
## 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!`
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!`<br>
⚠️ **Warning**: Do not use the symbols `@` and `:` in your passwords. These symbols are used to build database connection strings. You will experience issues when using these symbols!
Then run:

View File

@@ -66,7 +66,7 @@ spec:
value: nextcloud-aio-talk
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-apache:20240617_084300-latest"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-apache:20240701_074701-latest"
name: nextcloud-aio-apache
ports:
- containerPort: {{ .Values.APACHE_PORT }}

View File

View File

@@ -59,7 +59,7 @@ spec:
value: "90"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-clamav:20240617_084300-latest"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-clamav:20240701_074701-latest"
name: nextcloud-aio-clamav
ports:
- containerPort: 3310

View File

View File

@@ -36,7 +36,7 @@ spec:
value: --o:ssl.enable=false --o:ssl.termination=true --o:mount_jail_tree=false --o:logging.level=warning --o:home_mode.enable=true {{ .Values.COLLABORA_SECCOMP_POLICY }} --o:remote_font_config.url=https://{{ .Values.NC_DOMAIN }}/apps/richdocuments/settings/fonts.json
- name: server_name
value: "{{ .Values.NC_DOMAIN }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-collabora:20240617_084300-latest"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-collabora:20240701_074701-latest"
name: nextcloud-aio-collabora
ports:
- containerPort: 9980
@@ -45,6 +45,7 @@ spec:
capabilities:
add:
- MKNOD
- SYS_ADMIN
drop:
- NET_RAW
{{- end }}

View File

@@ -70,7 +70,7 @@ spec:
value: nextcloud
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-postgresql:20240617_084300-latest"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-postgresql:20240701_074701-latest"
name: nextcloud-aio-database
ports:
- containerPort: 5432

View File

View File

@@ -60,7 +60,7 @@ spec:
value: basic
- name: xpack.security.enabled
value: "false"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-fulltextsearch:20240617_084300-latest"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-fulltextsearch:20240701_074701-latest"
name: nextcloud-aio-fulltextsearch
ports:
- containerPort: 9200

View File

@@ -28,7 +28,7 @@ spec:
value: "{{ .Values.IMAGINARY_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-imaginary:20240617_084300-latest"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-imaginary:20240701_074701-latest"
name: nextcloud-aio-imaginary
ports:
- containerPort: 9000

View File

@@ -173,7 +173,7 @@ spec:
value: "{{ .Values.TIMEZONE }}"
- name: UPDATE_NEXTCLOUD_APPS
value: "{{ .Values.UPDATE_NEXTCLOUD_APPS }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-nextcloud:20240617_084300-latest"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-nextcloud:20240701_074701-latest"
name: nextcloud-aio-nextcloud
ports:
- containerPort: 9000

View File

@@ -57,7 +57,7 @@ spec:
value: nextcloud-aio-redis
- name: REDIS_HOST_PASSWORD
value: "{{ .Values.REDIS_PASSWORD }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-notify-push:20240617_084300-latest"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-notify-push:20240701_074701-latest"
name: nextcloud-aio-notify-push
ports:
- containerPort: 7867

View File

@@ -48,7 +48,7 @@ spec:
value: "{{ .Values.ONLYOFFICE_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-onlyoffice:20240617_084300-latest"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-onlyoffice:20240701_074701-latest"
name: nextcloud-aio-onlyoffice
ports:
- containerPort: 80

View File

@@ -43,7 +43,7 @@ spec:
value: "{{ .Values.REDIS_PASSWORD }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-redis:20240617_084300-latest"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-redis:20240701_074701-latest"
name: nextcloud-aio-redis
ports:
- containerPort: 6379

View File

View File

@@ -42,7 +42,7 @@ spec:
value: "{{ .Values.TURN_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-talk:20240617_084300-latest"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-talk:20240701_074701-latest"
name: nextcloud-aio-talk
ports:
- containerPort: {{ .Values.TALK_PORT }}

View File

@@ -32,7 +32,7 @@ spec:
value: "{{ .Values.RECORDING_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-talk-recording:20240617_084300-latest"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-talk-recording:20240701_074701-latest"
name: nextcloud-aio-talk-recording
ports:
- containerPort: 1234

View File

0
nextcloud-aio-helm-chart/update-helm.sh Normal file → Executable file
View File

0
nextcloud-aio-helm-chart/values.yaml Normal file → Executable file
View File

View File

@@ -204,6 +204,7 @@
"TALK_PORT=%TALK_PORT%",
"IMAGINARY_ENABLED=%IMAGINARY_ENABLED%",
"IMAGINARY_HOST=nextcloud-aio-imaginary",
"CLAMAV_MAX_SIZE=%APACHE_MAX_SIZE%",
"PHP_UPLOAD_LIMIT=%NEXTCLOUD_UPLOAD_LIMIT%",
"PHP_MEMORY_LIMIT=%NEXTCLOUD_MEMORY_LIMIT%",
"FULLTEXTSEARCH_ENABLED=%FULLTEXTSEARCH_ENABLED%",
@@ -221,7 +222,6 @@
"DOCKER_SOCKET_PROXY_ENABLED=%DOCKER_SOCKET_PROXY_ENABLED%",
"REMOVE_DISABLED_APPS=%REMOVE_DISABLED_APPS%",
"APACHE_PORT=%APACHE_PORT%",
"APACHE_IP_BINDING=%APACHE_IP_BINDING%",
"ADDITIONAL_TRUSTED_PROXY=%CADDY_IP_ADDRESS%",
"THIS_IS_AIO=true",
"IMAGINARY_SECRET=%IMAGINARY_SECRET%"
@@ -575,6 +575,7 @@
"internal_port": "3310",
"environment": [
"TZ=%TIMEZONE%",
"MAX_SIZE=%NEXTCLOUD_UPLOAD_LIMIT%",
"CLAMD_STARTUP_TIMEOUT=90"
],
"volumes": [

View File

@@ -137,7 +137,7 @@ class DockerActionManager
} elseif($internalPort === '%TALK_PORT%') {
$internalPort = $this->configurationManager->GetTalkPort();
}
if ($internalPort !== "" && $internalPort !== 'host') {
$connection = @fsockopen($containerName, (int)$internalPort, $errno, $errstr, 0.2);
if ($connection) {
@@ -295,8 +295,6 @@ class DockerActionManager
$replacements[1] = $this->configurationManager->GetSelectedRestoreTime();
} elseif ($out[1] === 'APACHE_PORT') {
$replacements[1] = $this->configurationManager->GetApachePort();
} elseif ($out[1] === 'APACHE_IP_BINDING') {
$replacements[1] = $this->configurationManager->GetApacheIPBinding();
} elseif ($out[1] === 'TALK_PORT') {
$replacements[1] = $this->configurationManager->GetTalkPort();
} elseif ($out[1] === 'NEXTCLOUD_MOUNT') {
@@ -438,7 +436,7 @@ class DockerActionManager
$requestBody['HostConfig']['RestartPolicy']['Name'] = $container->GetRestartPolicy();
$requestBody['HostConfig']['ReadonlyRootfs'] = $container->GetReadOnlySetting();
$exposedPorts = [];
if ($container->GetInternalPort() !== 'host') {
foreach($container->GetPorts()->GetPorts() as $value) {
@@ -478,6 +476,10 @@ class DockerActionManager
$ipBinding = $value->ipBinding;
if ($ipBinding === '%APACHE_IP_BINDING%') {
$ipBinding = $this->configurationManager->GetApacheIPBinding();
// Do not expose if AIO is in internal network mode
if ($ipBinding === '@INTERNAL') {
continue;
}
}
$portWithProtocol = $port . '/' . $protocol;
$requestBody['HostConfig']['PortBindings'][$portWithProtocol] = [
@@ -708,7 +710,7 @@ class DockerActionManager
if (!isset($imageOutput['RepoDigests'])) {
error_log('RepoDigests is not set of container ' . $containerName);
return null;
}
}
if (!is_array($imageOutput['RepoDigests'])) {
error_log('RepoDigests of ' . $containerName . ' is not an array which is not allowed!');

View File

@@ -16,7 +16,7 @@
</header>
<div class="content">
<h1>Nextcloud AIO v9.1.0</h1>
<h1>Nextcloud AIO v9.2.0</h1>
{# Add 2nd tab warning #}
<script type="text/javascript" src="second-tab-warning.js"></script>
@@ -71,7 +71,7 @@
The whole process can take a while as your containers will be updated.<br /><br />
{% endif %}
<a href="" class="button reload">Reload ↻</a><br/><br/>
If the daily bacckup should be stuck somehow, you can make it unstuck by running <strong>sudo docker exec nextcloud-aio-mastercontainer rm /mnt/docker-aio-config/data/daily_backup_running</strong> and afterwards reloading this interface.<br /><br />
If the daily backup is stuck somehow, you can unstick it by running <strong>sudo docker exec nextcloud-aio-mastercontainer rm /mnt/docker-aio-config/data/daily_backup_running</strong> and afterwards reloading this interface.<br /><br />
{% elseif isWatchtowerRunning == true %}
<span class="status running"></span> Mastercontainer update currently running. Once the update is complete the mastercontainer will restart, making it unavailable for a moment. Please wait until it's done. (<a href="/api/docker/logs?id=nextcloud-aio-watchtower" target="_blank" rel="noopener">Logs</a>)<br /><br />
<a href="" class="button reload">Reload ↻</a><br/>

View File

@@ -91,7 +91,7 @@ Add this as a new Apache site config:
RewriteCond %{HTTP:Upgrade} websocket [NC]
RewriteCond %{HTTP:Connection} upgrade [NC]
RewriteCond %{THE_REQUEST} "^[a-zA-Z]+ /(.*) HTTP/\d+(\.\d+)?$"
RewriteRule .? "ws://localhost:11000/%1" [P,L]
RewriteRule .? "ws://localhost:11000/%1" [P,L,UnsafeAllow3F]
# Enable h2, h2c and http1.1
Protocols h2 h2c http/1.1