From 32f56fd1a93dff47d1d386abc7a7e6f141801fd5 Mon Sep 17 00:00:00 2001 From: GitHub Workflow Date: Thu, 23 Nov 2023 18:16:36 +0000 Subject: [PATCH] Repo-sync --- Containers/fulltextsearch/Dockerfile | 2 +- Containers/nextcloud/Dockerfile | 2 +- manual-install/latest.yml | 2 ++ nextcloud-aio-helm-chart/Chart.yaml | 2 +- .../nextcloud-aio-clamav-persistentvolumeclaim.yaml | 2 ++ .../templates/nextcloud-aio-nextcloud-deployment.yaml | 5 ++++- .../nextcloud-aio-onlyoffice-persistentvolumeclaim.yaml | 2 ++ nextcloud-aio-helm-chart/update-helm.sh | 4 ++++ nextcloud-aio-helm-chart/values.yaml | 1 + php/templates/containers.twig | 2 +- 10 files changed, 19 insertions(+), 5 deletions(-) diff --git a/Containers/fulltextsearch/Dockerfile b/Containers/fulltextsearch/Dockerfile index 7e0ae167..622ae2bf 100644 --- a/Containers/fulltextsearch/Dockerfile +++ b/Containers/fulltextsearch/Dockerfile @@ -1,5 +1,5 @@ # Probably from here https://github.com/elastic/elasticsearch/blob/main/distribution/docker/src/docker/Dockerfile -FROM elasticsearch:8.11.1 +FROM elasticsearch:8.11.0 USER root diff --git a/Containers/nextcloud/Dockerfile b/Containers/nextcloud/Dockerfile index 4d70d764..21334726 100644 --- a/Containers/nextcloud/Dockerfile +++ b/Containers/nextcloud/Dockerfile @@ -3,7 +3,7 @@ FROM php:8.1.25-fpm-alpine3.18 ENV PHP_MEMORY_LIMIT 512M ENV PHP_UPLOAD_LIMIT 10G ENV PHP_MAX_TIME 3600 -ENV NEXTCLOUD_VERSION 27.1.3 +ENV NEXTCLOUD_VERSION 27.1.4 ENV AIO_TOKEN 123456 ENV AIO_URL localhost diff --git a/manual-install/latest.yml b/manual-install/latest.yml index 5b714ccb..eb755a0d 100644 --- a/manual-install/latest.yml +++ b/manual-install/latest.yml @@ -202,6 +202,8 @@ services: - collabora networks: - nextcloud-aio + cap_add: + - MKNOD nextcloud-aio-talk: image: nextcloud/aio-talk:latest diff --git a/nextcloud-aio-helm-chart/Chart.yaml b/nextcloud-aio-helm-chart/Chart.yaml index 6e3e8b5c..37669b75 100755 --- a/nextcloud-aio-helm-chart/Chart.yaml +++ b/nextcloud-aio-helm-chart/Chart.yaml @@ -1,6 +1,6 @@ name: nextcloud-aio-helm-chart description: A generated Helm Chart for Nextcloud AIO from Skippbox Kompose -version: 7.7.0 +version: 7.7.1-dev3 apiVersion: v2 keywords: - latest diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-persistentvolumeclaim.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-persistentvolumeclaim.yaml index f7279c3a..c08d5f75 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-persistentvolumeclaim.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-persistentvolumeclaim.yaml @@ -1,3 +1,4 @@ +{{- if eq .Values.CLAMAV_ENABLED "yes" }} apiVersion: v1 kind: PersistentVolumeClaim metadata: @@ -14,3 +15,4 @@ spec: resources: requests: storage: {{ .Values.CLAMAV_STORAGE_SIZE }} +{{- end }} diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml index 33c7b00f..8353c7f0 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml @@ -57,6 +57,8 @@ spec: value: "{{ .Values.SUBSCRIPTION_KEY }}" - name: APPS_ALLOWLIST value: "{{ .Values.APPS_ALLOWLIST }}" + - name: ADDITIONAL_TRUSTED_PROXY + value: "{{ .Values.ADDITIONAL_TRUSTED_PROXY }}" - name: ADDITIONAL_APKS value: "{{ .Values.NEXTCLOUD_ADDITIONAL_APKS }}" - name: ADDITIONAL_PHP_EXTENSIONS @@ -143,7 +145,8 @@ spec: value: "{{ .Values.TIMEZONE }}" - name: UPDATE_NEXTCLOUD_APPS value: "{{ .Values.UPDATE_NEXTCLOUD_APPS }}" - image: nextcloud/aio-nextcloud:20231123_084113-latest + image: nextcloud/aio-nextcloud:develop + imagePullPolicy: Always name: nextcloud-aio-nextcloud ports: - containerPort: 9000 diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-persistentvolumeclaim.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-persistentvolumeclaim.yaml index cd4c8132..55445a35 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-persistentvolumeclaim.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-persistentvolumeclaim.yaml @@ -1,3 +1,4 @@ +{{- if eq .Values.ONLYOFFICE_ENABLED "yes" }} apiVersion: v1 kind: PersistentVolumeClaim metadata: @@ -14,3 +15,4 @@ spec: resources: requests: storage: {{ .Values.ONLYOFFICE_STORAGE_SIZE }} +{{- end }} diff --git a/nextcloud-aio-helm-chart/update-helm.sh b/nextcloud-aio-helm-chart/update-helm.sh index 35be3432..a105d1dd 100755 --- a/nextcloud-aio-helm-chart/update-helm.sh +++ b/nextcloud-aio-helm-chart/update-helm.sh @@ -308,6 +308,10 @@ for variable in "${ENABLED_VARIABLES[@]}"; do find ./ -name "*nextcloud-aio-$name-service.yaml" -exec sed -i "1i\\{{- if eq .Values.$variable \"yes\" }}" \{} \; # shellcheck disable=SC1083 find ./ -name "*nextcloud-aio-$name-service.yaml" -exec sed -i "$ a {{- end }}" \{} \; + # shellcheck disable=SC1083 + find ./ -name "*nextcloud-aio-$name-persistentvolumeclaim.yaml" -exec sed -i "1i\\{{- if eq .Values.$variable \"yes\" }}" \{} \; + # shellcheck disable=SC1083 + find ./ -name "*nextcloud-aio-$name-persistentvolumeclaim.yaml" -exec sed -i "$ a {{- end }}" \{} \; done chmod 777 -R ./ diff --git a/nextcloud-aio-helm-chart/values.yaml b/nextcloud-aio-helm-chart/values.yaml index 1fe9674e..d7312d31 100755 --- a/nextcloud-aio-helm-chart/values.yaml +++ b/nextcloud-aio-helm-chart/values.yaml @@ -49,6 +49,7 @@ REDIS_STORAGE_SIZE: 1Gi # You can change the size of the redis volume that NAMESPACE: default # By changing this, you can adjust the namespace of the installation which allows to install multiple instances on one kubernetes cluster SUBSCRIPTION_KEY: # This allows to set the Nextcloud Enterprise key via ENV APPS_ALLOWLIST: # This allows to configure allowed apps that will be shown in Nextcloud's Appstore. You need to enter the app-IDs of the apps here and separate them with spaces. E.g. 'files richdocuments' +ADDITIONAL_TRUSTED_PROXY: # Allows to add one additional ip-address to Nextcloud's trusted proxies and to the Office WOPI-allowlist automatically. Set it e.g. like this: 'your.public.ip-address'. You can also use an ip-range here. SMTP_HOST: # (empty by default): The hostname of the SMTP server. SMTP_SECURE: # (empty by default): Set to 'ssl' to use SSL, or 'tls' to use STARTTLS. SMTP_PORT: # (default: '465' for SSL and '25' for non-secure connections): Optional port for the SMTP connection. Use '587' for an alternative port for STARTTLS. diff --git a/php/templates/containers.twig b/php/templates/containers.twig index ae7bf484..d1e7827d 100644 --- a/php/templates/containers.twig +++ b/php/templates/containers.twig @@ -16,7 +16,7 @@
-

Nextcloud AIO v7.7.0

+

Nextcloud AIO v7.7.1

{# Add 2nd tab warning #}