mirror of
https://github.com/nextcloud/all-in-one.git
synced 2026-05-21 19:00:33 +00:00
Compare commits
53 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ef1e7c28f6 | ||
|
|
f90971ef9d | ||
|
|
efca35b0e9 | ||
|
|
f72ab28a41 | ||
|
|
504ae2d617 | ||
|
|
b2d373cd7f | ||
|
|
fdc5e87a01 | ||
|
|
002c9a8fc2 | ||
|
|
d304c791ff | ||
|
|
789c9abcd2 | ||
|
|
c69aa56349 | ||
|
|
3cdb855df3 | ||
|
|
66dc0bc7d6 | ||
|
|
6463df73e6 | ||
|
|
ed1de79e9b | ||
|
|
01fbe3dbc9 | ||
|
|
03cb72116e | ||
|
|
3348849792 | ||
|
|
5e12c266df | ||
|
|
c8d461a061 | ||
|
|
017e1ee23d | ||
|
|
95a1ed0bba | ||
|
|
3a691aa9a2 | ||
|
|
5e320a7b88 | ||
|
|
bf29c8578a | ||
|
|
abe97c87c1 | ||
|
|
f1dc400e81 | ||
|
|
f29e66c1b4 | ||
|
|
74f84bac78 | ||
|
|
7548790041 | ||
|
|
66bbe0dbb8 | ||
|
|
17f19c5d75 | ||
|
|
5a67944315 | ||
|
|
d727f11102 | ||
|
|
75e5fa84ce | ||
|
|
52fd04640d | ||
|
|
b8bb08cf3b | ||
|
|
6fb4b3479e | ||
|
|
a98e89b5c9 | ||
|
|
83c24156bc | ||
|
|
b3977ed1c8 | ||
|
|
52cb90a802 | ||
|
|
9dfdfbf27b | ||
|
|
64a30cdc0e | ||
|
|
f19579a4bc | ||
|
|
3c8cb2bdb2 | ||
|
|
9d4055c86d | ||
|
|
571edd4bb4 | ||
|
|
05a7b1ebf5 | ||
|
|
b37be48348 | ||
|
|
8a6b6f4295 | ||
|
|
225442c13c | ||
|
|
0d572bce06 |
@@ -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
|
||||
|
||||
|
||||
@@ -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"]
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
# AIO settings
|
||||
MaxDirectoryRecursion 30
|
||||
MaxFileSize 100M
|
||||
PCREMaxFileSize 100M
|
||||
StreamMaxLength 100M
|
||||
MaxFileSize 10G
|
||||
PCREMaxFileSize 10G
|
||||
StreamMaxLength 10G
|
||||
|
||||
4
Containers/clamav/start.script
Normal file
4
Containers/clamav/start.script
Normal 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
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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'));
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
}
|
||||
],
|
||||
"aio_variables": [
|
||||
"apache_ip_binding=127.0.0.1",
|
||||
"apache_ip_binding=@INTERNAL",
|
||||
"apache_port=11000"
|
||||
],
|
||||
"nextcloud_exec_commands": [
|
||||
|
||||
@@ -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
2
nextcloud-aio-helm-chart/Chart.yaml
Normal file → Executable 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
3
nextcloud-aio-helm-chart/readme.md
Normal file → Executable 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:
|
||||
|
||||
|
||||
2
nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-deployment.yaml
Normal file → Executable file
2
nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-deployment.yaml
Normal file → Executable 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 }}
|
||||
|
||||
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-persistentvolumeclaim.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-persistentvolumeclaim.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-service.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-service.yaml
Normal file → Executable file
2
nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-deployment.yaml
Normal file → Executable file
2
nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-deployment.yaml
Normal file → Executable 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
|
||||
|
||||
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-persistentvolumeclaim.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-persistentvolumeclaim.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-service.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-service.yaml
Normal file → Executable file
3
nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml
Normal file → Executable file
3
nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml
Normal file → Executable 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 }}
|
||||
|
||||
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-service.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-service.yaml
Normal file → Executable file
2
nextcloud-aio-helm-chart/templates/nextcloud-aio-database-deployment.yaml
Normal file → Executable file
2
nextcloud-aio-helm-chart/templates/nextcloud-aio-database-deployment.yaml
Normal file → Executable 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
|
||||
|
||||
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-database-dump-persistentvolumeclaim.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-database-dump-persistentvolumeclaim.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-database-persistentvolumeclaim.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-database-persistentvolumeclaim.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-database-service.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-database-service.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-elasticsearch-persistentvolumeclaim.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-elasticsearch-persistentvolumeclaim.yaml
Normal file → Executable file
2
nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml
Normal file → Executable file
2
nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml
Normal file → Executable 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
|
||||
|
||||
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-service.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-service.yaml
Normal file → Executable file
2
nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-deployment.yaml
Normal file → Executable file
2
nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-deployment.yaml
Normal file → Executable 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
|
||||
|
||||
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-service.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-service.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-namespace-namespace.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-namespace-namespace.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-data-persistentvolumeclaim.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-data-persistentvolumeclaim.yaml
Normal file → Executable file
2
nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml
Normal file → Executable file
2
nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml
Normal file → Executable 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
|
||||
|
||||
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-persistentvolumeclaim.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-persistentvolumeclaim.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-service.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-service.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-trusted-cacerts-persistentvolumeclaim.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-trusted-cacerts-persistentvolumeclaim.yaml
Normal file → Executable file
2
nextcloud-aio-helm-chart/templates/nextcloud-aio-notify-push-deployment.yaml
Normal file → Executable file
2
nextcloud-aio-helm-chart/templates/nextcloud-aio-notify-push-deployment.yaml
Normal file → Executable 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
|
||||
|
||||
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-notify-push-service.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-notify-push-service.yaml
Normal file → Executable file
2
nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml
Normal file → Executable file
2
nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml
Normal file → Executable 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
|
||||
|
||||
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-persistentvolumeclaim.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-persistentvolumeclaim.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-service.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-service.yaml
Normal file → Executable file
2
nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-deployment.yaml
Normal file → Executable file
2
nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-deployment.yaml
Normal file → Executable 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
|
||||
|
||||
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-persistentvolumeclaim.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-persistentvolumeclaim.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-service.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-service.yaml
Normal file → Executable file
2
nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml
Normal file → Executable file
2
nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml
Normal file → Executable 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 }}
|
||||
|
||||
2
nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-deployment.yaml
Normal file → Executable file
2
nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-deployment.yaml
Normal file → Executable 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
|
||||
|
||||
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-service.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-service.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-service.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-service.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/update-helm.sh
Normal file → Executable file
0
nextcloud-aio-helm-chart/update-helm.sh
Normal file → Executable file
0
nextcloud-aio-helm-chart/values.yaml
Normal file → Executable file
0
nextcloud-aio-helm-chart/values.yaml
Normal file → Executable 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": [
|
||||
|
||||
@@ -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!');
|
||||
|
||||
@@ -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/>
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user