Compare commits

...

31 Commits

Author SHA1 Message Date
Simon L
68d66a53fb increase to 7.13.1
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-03-01 18:35:24 +01:00
Simon L
112cc010b9 Merge pull request #4116 from jhesketh/patch-1
Drop NET_RAW from all containers in manual
2024-03-01 18:34:20 +01:00
Simon L
20c3fbc154 add it to jscon schema
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-03-01 18:31:49 +01:00
Simon L
426c46d0ae Merge pull request #4279 from FaySmash/patch-1
Added a replace statement for the database-dump.sql
2024-03-01 18:27:56 +01:00
Simon L
04ff2c9935 Merge pull request #4293 from rugk/patch-1
Fix and beautify link to Docker --init
2024-03-01 18:27:29 +01:00
Simon L
bf307eb5ff Merge pull request #4134 from nextcloud/nextcloud-container-update
Nextcloud dependency update
2024-02-29 15:12:32 +01:00
szaimen
6dbb0841bf nextcloud-update automated change
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2024-02-29 12:33:50 +00:00
rugk
8f14e47401 Fix and beautify link to Docker --init
* The content has moved and is apparently now there (old link did not work):
* I use a link text instead of a plain link.

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

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

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

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

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

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

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

Signed-off-by: FaySmash <30392780+FaySmash@users.noreply.github.com>
2024-02-25 16:13:39 +01:00
nextcloud-command
a5ec42bbcb Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2024-02-24 04:56:22 +00:00
Simon L
fbf32ebae0 Merge pull request #4270 from nextcloud/enh/noid/disable-fts-volume
helm chart - disable FTS volume if not enabled
2024-02-23 17:56:06 +01:00
Simon L
ba7bc4818a helm chart - disable FTS volume if not enabled
Signed-off-by: Simon L <szaimen@e.mail.de>
2024-02-23 16:19:27 +01:00
dependabot[bot]
da60cc44bf Bump elasticsearch from 8.12.1 to 8.12.2 in /Containers/fulltextsearch
Bumps elasticsearch from 8.12.1 to 8.12.2.

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

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

Signed-off-by: Joshua Hesketh <josh@hesketh.net.au>
2024-02-12 14:05:50 +11:00
51 changed files with 220 additions and 117 deletions

View File

@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:latest
# Probably from this file: https://github.com/Cisco-Talos/clamav-docker/blob/main/clamav/1.1/alpine/Dockerfile
FROM clamav/clamav:1.3.0-39
FROM clamav/clamav:1.3.0-40
COPY clamav.conf /tmp/clamav.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:23.05.9.1.1
FROM collabora/code:23.05.9.2.1
USER root

View File

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

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.12.1
FROM elasticsearch:8.12.2
USER root

View File

@@ -4,14 +4,18 @@ FROM php:8.1.27-fpm-alpine3.19
ENV PHP_MEMORY_LIMIT 512M
ENV PHP_UPLOAD_LIMIT 10G
ENV PHP_MAX_TIME 3600
ENV NEXTCLOUD_VERSION 27.1.5
ENV SOURCE_LOCATION /usr/src/nextcloud
# AIO settings start # Do not remove or change this line!
ENV NEXTCLOUD_VERSION 27.1.7
ENV AIO_TOKEN 123456
ENV AIO_URL localhost
COPY supervisord.conf /supervisord.conf
# AIO settings end # Do not remove or change this line!
COPY --chmod=775 *.sh /
COPY --chmod=774 upgrade.exclude /upgrade.exclude
COPY config/*.php /
COPY supervisord.conf /supervisord.conf
VOLUME /mnt/ncdata
VOLUME /var/www/html
@@ -116,6 +120,7 @@ RUN set -ex; \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www; \
\
# Download Nextcloud archive start # Do not remove or change this line!
apk add --no-cache --virtual .fetch-deps \
bzip2 \
gnupg \
@@ -136,8 +141,9 @@ RUN set -ex; \
mkdir -p /usr/src/nextcloud/custom_apps; \
chmod +x /usr/src/nextcloud/occ; \
mkdir -p /usr/src/nextcloud/config; \
mv /*.php /usr/src/nextcloud/config/; \
apk del .fetch-deps; \
# Download Nextcloud archive end # Do not remove or change this line!
mv /*.php /usr/src/nextcloud/config/; \
\
# Template from https://github.com/nextcloud/docker/blob/master/.examples/dockerfiles/full/fpm-alpine/Dockerfile
apk add --no-cache \
@@ -205,18 +211,20 @@ RUN set -ex; \
sed -i 's/^pm.max_children =.*/pm.max_children = 5000/' /usr/local/etc/php-fpm.d/www.conf; \
sed -i 's|access.log = /proc/self/fd/2|access.log = /proc/self/fd/1|' /usr/local/etc/php-fpm.d/docker.conf; \
\
# AIO cloning start # Do not remove or change this line!
rm -rf /tmp/nextcloud-aio && \
mkdir -p /tmp/nextcloud-aio && \
cd /tmp/nextcloud-aio && \
git clone https://github.com/nextcloud-releases/all-in-one.git --depth 1 .; \
mkdir -p /usr/src/nextcloud/apps/nextcloud-aio; \
cp -r ./app/* /usr/src/nextcloud/apps/nextcloud-aio/; \
# AIO cloning end # Do not remove or change this line!
\
chown www-data:root -R /usr/src && \
chown www-data:root -R /usr/local/etc/php/conf.d && \
chown www-data:root -R /usr/local/etc/php-fpm.d && \
chmod -R 777 /tmp; \
rm -r /usr/src/nextcloud/apps/updatenotification; \
rm -rf /usr/src/nextcloud/apps/updatenotification; \
\
mkdir -p /nc-updater; \
chown -R www-data:www-data /nc-updater; \

View File

@@ -55,9 +55,9 @@ if [ -f /var/www/html/version.php ]; then
else
installed_version="0.0.0.0"
fi
if [ -f "/usr/src/nextcloud/version.php" ]; then
if [ -f "$SOURCE_LOCATION/version.php" ]; then
# shellcheck disable=SC2016
image_version="$(php -r 'require "/usr/src/nextcloud/version.php"; echo implode(".", $OC_Version);')"
image_version="$(php -r "require '$SOURCE_LOCATION/version.php'; echo implode('.', \$OC_Version);")"
else
image_version="$installed_version"
fi
@@ -106,6 +106,8 @@ if ! [ -f "$NEXTCLOUD_DATA_DIR/skip.update" ]; then
fi
if [ "$installed_version" != "0.0.0.0" ] && [ "$((IMAGE_MAJOR - INSTALLED_MAJOR))" -gt 1 ]; then
# Do not skip major versions placeholder # Do not remove or change this line!
# Do not skip major versions start # Do not remove or change this line!
set -ex
NEXT_MAJOR="$((INSTALLED_MAJOR + 1))"
curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/latest-${NEXT_MAJOR}.tar.bz2"
@@ -122,17 +124,18 @@ if ! [ -f "$NEXTCLOUD_DATA_DIR/skip.update" ]; then
mkdir -p /usr/src/tmp/nextcloud/data
mkdir -p /usr/src/tmp/nextcloud/custom_apps
chmod +x /usr/src/tmp/nextcloud/occ
cp -r /usr/src/nextcloud/config/* /usr/src/tmp/nextcloud/config/
cp -r "$SOURCE_LOCATION"/config/* /usr/src/tmp/nextcloud/config/
mkdir -p /usr/src/tmp/nextcloud/apps/nextcloud-aio
cp -r /usr/src/nextcloud/apps/nextcloud-aio/* /usr/src/tmp/nextcloud/apps/nextcloud-aio/
mv /usr/src/nextcloud /usr/src/temp-nextcloud
mv /usr/src/tmp/nextcloud /usr/src/nextcloud
cp -r "$SOURCE_LOCATION"/apps/nextcloud-aio/* /usr/src/tmp/nextcloud/apps/nextcloud-aio/
mv "$SOURCE_LOCATION" /usr/src/temp-nextcloud
mv /usr/src/tmp/nextcloud "$SOURCE_LOCATION"
rm -r /usr/src/tmp
rm -r /usr/src/temp-nextcloud
# shellcheck disable=SC2016
image_version="$(php -r 'require "/usr/src/nextcloud/version.php"; echo implode(".", $OC_Version);')"
image_version="$(php -r "require $SOURCE_LOCATION/version.php; echo implode('.', \$OC_Version);")"
IMAGE_MAJOR="${image_version%%.*}"
set +ex
# Do not skip major versions end # Do not remove or change this line!
fi
if [ "$installed_version" != "0.0.0.0" ]; then
@@ -186,15 +189,15 @@ if ! [ -f "$NEXTCLOUD_DATA_DIR/skip.update" ]; then
fi
echo "Initializing nextcloud $image_version ..."
rsync -rlD --delete --exclude-from=/upgrade.exclude /usr/src/nextcloud/ /var/www/html/
rsync -rlD --delete --exclude-from=/upgrade.exclude "$SOURCE_LOCATION/" /var/www/html/
for dir in config data custom_apps themes; do
if [ ! -d "/var/www/html/$dir" ] || directory_empty "/var/www/html/$dir"; then
rsync -rlD --include "/$dir/" --exclude '/*' /usr/src/nextcloud/ /var/www/html/
rsync -rlD --include "/$dir/" --exclude '/*' "$SOURCE_LOCATION/" /var/www/html/
fi
done
rsync -rlD --delete --include '/config/' --exclude '/*' --exclude '/config/CAN_INSTALL' --exclude '/config/config.sample.php' --exclude '/config/config.php' /usr/src/nextcloud/ /var/www/html/
rsync -rlD --include '/version.php' --exclude '/*' /usr/src/nextcloud/ /var/www/html/
rsync -rlD --delete --include '/config/' --exclude '/*' --exclude '/config/CAN_INSTALL' --exclude '/config/config.sample.php' --exclude '/config/config.php' "$SOURCE_LOCATION/" /var/www/html/
rsync -rlD --include '/version.php' --exclude '/*' "$SOURCE_LOCATION/" /var/www/html/
echo "Initializing finished"
#install
@@ -255,6 +258,7 @@ DATADIR_PERMISSION_CONF
# unset admin password
unset ADMIN_PASSWORD
# AIO update to latest start # Do not remove or change this line!
if [ "$INSTALL_LATEST_MAJOR" = yes ]; then
php /var/www/html/occ config:system:set updatedirectory --value="/nc-updater"
INSTALLED_AT="$(php /var/www/html/occ config:app:get core installedat)"
@@ -292,6 +296,7 @@ DATADIR_PERMISSION_CONF
php /var/www/html/occ db:add-missing-primary-keys
yes | php /var/www/html/occ db:convert-filecache-bigint
fi
# AIO update to latest end # Do not remove or change this line!
# Apply log settings
echo "Applying default settings..."
@@ -463,11 +468,13 @@ if [ -f "$NEXTCLOUD_DATA_DIR/fingerprint.update" ]; then
rm "$NEXTCLOUD_DATA_DIR/fingerprint.update"
fi
# AIO one-click settings start # Do not remove or change this line!
# Apply one-click-instance settings
echo "Applying one-click-instance settings..."
php /var/www/html/occ config:system:set one-click-instance --value=true --type=bool
php /var/www/html/occ config:system:set one-click-instance.user-limit --value=100 --type=int
php /var/www/html/occ config:system:set one-click-instance.link --value="https://nextcloud.com/all-in-one/"
# AIO one-click settings end # Do not remove or change this line!
php /var/www/html/occ app:enable support
if [ -n "$SUBSCRIPTION_KEY" ] && [ -z "$(php /var/www/html/occ config:app:get support potential_subscription_key)" ]; then
php /var/www/html/occ config:app:set support potential_subscription_key --value="$SUBSCRIPTION_KEY"
@@ -503,6 +510,7 @@ else
php /var/www/html/occ config:system:set files_external_allow_create_new_local --type=bool --value=true
fi
# AIO app start # Do not remove or change this line!
# AIO app
if [ "$THIS_IS_AIO" = "true" ]; then
if [ "$(php /var/www/html/occ config:app:get nextcloud-aio enabled)" != "yes" ]; then
@@ -513,6 +521,7 @@ else
php /var/www/html/occ app:disable nextcloud-aio
fi
fi
# AIO app end # Do not remove or change this line!
# Notify push
if ! [ -d "/var/www/html/custom_apps/notify_push" ]; then

View File

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

View File

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

View File

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

View File

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

View File

@@ -2,12 +2,12 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-apache
name: nextcloud-aio-apache
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
replicas: 1
selector:
@@ -16,7 +16,7 @@ spec:
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.network/nextcloud-aio: "true"
@@ -59,8 +59,7 @@ spec:
value: nextcloud-aio-talk
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-apache:beta
imagePullPolicy: Always
image: nextcloud/aio-apache:20240228_172209-latest
name: nextcloud-aio-apache
ports:
- containerPort: {{ .Values.APACHE_PORT }}

View File

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

View File

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

View File

@@ -3,12 +3,12 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-clamav
name: nextcloud-aio-clamav
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
replicas: 1
selector:
@@ -17,7 +17,7 @@ spec:
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.network/nextcloud-aio: "true"
@@ -50,7 +50,7 @@ spec:
value: "90"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-clamav:20240201_120631-latest
image: nextcloud/aio-clamav:20240228_172209-latest
name: nextcloud-aio-clamav
ports:
- containerPort: 3310

View File

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

View File

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

View File

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

View File

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

View File

@@ -2,12 +2,12 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-database
name: nextcloud-aio-database
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
replicas: 1
selector:
@@ -16,7 +16,7 @@ spec:
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.network/nextcloud-aio: "true"
@@ -61,7 +61,7 @@ spec:
value: nextcloud
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-postgresql:20240201_120631-latest
image: nextcloud/aio-postgresql:20240228_172209-latest
name: nextcloud-aio-database
ports:
- containerPort: 5432

View File

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

View File

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

View File

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

View File

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

View File

@@ -3,12 +3,12 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-fulltextsearch
name: nextcloud-aio-fulltextsearch
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
replicas: 1
selector:
@@ -17,7 +17,7 @@ spec:
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.network/nextcloud-aio: "true"
@@ -55,7 +55,7 @@ spec:
value: basic
- name: xpack.security.enabled
value: "false"
image: nextcloud/aio-fulltextsearch:20240201_120631-latest
image: nextcloud/aio-fulltextsearch:20240228_172209-latest
name: nextcloud-aio-fulltextsearch
ports:
- containerPort: 9200

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -2,12 +2,12 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-nextcloud
name: nextcloud-aio-nextcloud
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
replicas: 1
selector:
@@ -16,7 +16,7 @@ spec:
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.network/nextcloud-aio: "true"
@@ -158,8 +158,7 @@ spec:
value: "{{ .Values.TIMEZONE }}"
- name: UPDATE_NEXTCLOUD_APPS
value: "{{ .Values.UPDATE_NEXTCLOUD_APPS }}"
image: nextcloud/aio-nextcloud:beta
imagePullPolicy: Always
image: nextcloud/aio-nextcloud:20240228_172209-latest
name: nextcloud-aio-nextcloud
ports:
- containerPort: 9000

View File

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

View File

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

View File

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

View File

@@ -2,12 +2,12 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-notify-push
name: nextcloud-aio-notify-push
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
replicas: 1
selector:
@@ -16,7 +16,7 @@ spec:
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.network/nextcloud-aio: "true"
@@ -50,7 +50,7 @@ spec:
value: nextcloud-aio-redis
- name: REDIS_HOST_PASSWORD
value: "{{ .Values.REDIS_PASSWORD }}"
image: nextcloud/aio-notify-push:20240201_120631-latest
image: nextcloud/aio-notify-push:20240228_172209-latest
name: nextcloud-aio-notify-push
ports:
- containerPort: 7867

View File

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

View File

@@ -3,12 +3,12 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-onlyoffice
name: nextcloud-aio-onlyoffice
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
replicas: 1
selector:
@@ -17,7 +17,7 @@ spec:
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.network/nextcloud-aio: "true"
@@ -43,7 +43,7 @@ spec:
value: "{{ .Values.ONLYOFFICE_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-onlyoffice:20240201_120631-latest
image: nextcloud/aio-onlyoffice:20240228_172209-latest
name: nextcloud-aio-onlyoffice
ports:
- containerPort: 80

View File

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

View File

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

View File

@@ -2,12 +2,12 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-redis
name: nextcloud-aio-redis
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
replicas: 1
selector:
@@ -16,7 +16,7 @@ spec:
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.network/nextcloud-aio: "true"
@@ -38,7 +38,7 @@ spec:
value: "{{ .Values.REDIS_PASSWORD }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-redis:20240201_120631-latest
image: nextcloud/aio-redis:20240228_172209-latest
name: nextcloud-aio-redis
ports:
- containerPort: 6379

View File

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

View File

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

View File

@@ -3,12 +3,12 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.service: nextcloud-aio-talk
name: nextcloud-aio-talk
namespace: {{ .Values.NAMESPACE }}
namespace: "{{ .Values.NAMESPACE }}"
spec:
replicas: 1
selector:
@@ -17,7 +17,7 @@ spec:
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}"
kompose.version: 1.32.0 (765fde254)
labels:
io.kompose.network/nextcloud-aio: "true"
@@ -37,7 +37,7 @@ spec:
value: "{{ .Values.TURN_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-talk:20240201_120631-latest
image: nextcloud/aio-talk:20240228_172209-latest
name: nextcloud-aio-talk
ports:
- containerPort: {{ .Values.TALK_PORT }}

View File

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

View File

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

View File

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

View File

@@ -160,7 +160,7 @@ for variable in "${DEPLOYMENTS[@]}"; do
fi
done
# shellcheck disable=SC1083
find ./ -name '*.yaml' -exec sed -i "s|nextcloud-aio-namespace|\{\{ .Values.NAMESPACE \}\}|" \{} \;
find ./ -name '*.yaml' -exec sed -i 's|nextcloud-aio-namespace|"\{\{ .Values.NAMESPACE \}\}"|' \{} \;
# shellcheck disable=SC1083
find ./ -name '*service.yaml' -exec sed -i "/^status:/,$ d" \{} \;
# shellcheck disable=SC1083
@@ -350,6 +350,12 @@ for variable in "${ENABLED_VARIABLES[@]}"; do
find ./ -name "*nextcloud-aio-$name-persistentvolumeclaim.yaml" -exec sed -i "$ a {{- end }}" \{} \;
done
# Additional case for FTS volume
# shellcheck disable=SC1083
find ./ -name "*nextcloud-aio-elasticsearch-persistentvolumeclaim.yaml" -exec sed -i "1i\\{{- if eq .Values.FULLTEXTSEARCH_ENABLED \"yes\" }}" \{} \;
# shellcheck disable=SC1083
find ./ -name "*nextcloud-aio-elasticsearch-persistentvolumeclaim.yaml" -exec sed -i "$ a {{- end }}" \{} \;
chmod 777 -R ./
# Seems like the dir needs to match the name of the chart

View File

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

View File

@@ -65,6 +65,9 @@
"/usr/local/apache2/logs",
"/tmp",
"/home/www-data"
],
"cap_drop": [
"NET_RAW"
]
},
{
@@ -112,6 +115,9 @@
"read_only": true,
"tmpfs": [
"/var/run/postgresql"
],
"cap_drop": [
"NET_RAW"
]
},
{
@@ -226,6 +232,9 @@
],
"networks": [
"nextcloud-aio"
],
"cap_drop": [
"NET_RAW"
]
},
{
@@ -263,7 +272,10 @@
"networks": [
"nextcloud-aio"
],
"read_only": true
"read_only": true,
"cap_drop": [
"NET_RAW"
]
},
{
"container_name": "nextcloud-aio-redis",
@@ -295,7 +307,10 @@
"networks": [
"nextcloud-aio"
],
"read_only": true
"read_only": true,
"cap_drop": [
"NET_RAW"
]
},
{
"container_name": "nextcloud-aio-collabora",
@@ -328,6 +343,9 @@
],
"cap_add": [
"MKNOD"
],
"cap_drop": [
"NET_RAW"
]
},
{
@@ -380,6 +398,9 @@
"/opt/eturnal/run",
"/conf",
"/tmp"
],
"cap_drop": [
"NET_RAW"
]
},
{
@@ -414,6 +435,9 @@
"tmpfs": [
"/tmp",
"/conf"
],
"cap_drop": [
"NET_RAW"
]
},
{
@@ -472,6 +496,9 @@
"cap_add": [
"SYS_ADMIN"
],
"cap_drop": [
"NET_RAW"
],
"apparmor_unconfined": true,
"read_only": true,
"tmpfs": [
@@ -494,7 +521,10 @@
"writeable": false
}
],
"read_only": true
"read_only": true,
"cap_drop": [
"NET_RAW"
]
},
{
"container_name": "nextcloud-aio-domaincheck",
@@ -521,6 +551,9 @@
"tmpfs": [
"/etc/lighttpd",
"/var/www/domaincheck"
],
"cap_drop": [
"NET_RAW"
]
},
{
@@ -556,6 +589,9 @@
"/var/lock",
"/var/log/clamav",
"/tmp"
],
"cap_drop": [
"NET_RAW"
]
},
{
@@ -594,6 +630,9 @@
],
"networks": [
"nextcloud-aio"
],
"cap_drop": [
"NET_RAW"
]
},
{
@@ -613,6 +652,9 @@
"cap_add": [
"SYS_NICE"
],
"cap_drop": [
"NET_RAW"
],
"profiles": [
"imaginary"
],
@@ -662,6 +704,9 @@
],
"secrets": [
"FULLTEXTSEARCH_PASSWORD"
],
"cap_drop": [
"NET_RAW"
]
},
{
@@ -685,6 +730,9 @@
"read_only": true,
"tmpfs": [
"/tmp"
],
"cap_drop": [
"NET_RAW"
]
}
]

View File

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

View File

@@ -16,7 +16,7 @@
</header>
<div class="content">
<h1>Nextcloud AIO v7.13.0</h1>
<h1>Nextcloud AIO v7.13.1</h1>
{# Add 2nd tab warning #}
<script type="text/javascript" src="second-tab-warning.js"></script>

View File

@@ -103,7 +103,7 @@ The following instructions are meant for installations without a web server or r
<summary>Explanation of the command</summary>
- `sudo docker run` This command spins up a new docker container. Docker commands can optionally be used without `sudo` if the user is added to the docker group (this is not the same as docker rootless, see FAQ below).
- `--init` This option makes sure that no zombie-processes are created, ever. See https://docs.docker.com/engine/reference/run/#specify-an-init-process
- `--init` This option makes sure that no zombie-processes are created, ever. See [the Docker documentation](https://docs.docker.com/reference/cli/docker/container/run/#init).
- `--sig-proxy=false` This option allows to exit the container shell that gets attached automatically when using `docker run` by using `[CTRL] + [C]` without shutting down the container.
- `--name nextcloud-aio-mastercontainer` This is the name of the container. This line is not allowed to be changed, since mastercontainer updates would fail.
- `--restart always` This is the "restart policy". `always` means that the container should always get started with the Docker daemon. See the Docker documentation for further detail about restart policies: https://docs.docker.com/config/containers/start-containers-automatically/