From 7e1381913c379bdc319895d60d3ecb85aeff9802 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 28 Jan 2025 15:55:28 +0100 Subject: [PATCH 1/2] chore(nextcloud): Update to Nextcloud 30 --- roles/nextcloud/defaults/main.yml | 4 ++-- roles/nextcloud/tasks/main.yml | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/roles/nextcloud/defaults/main.yml b/roles/nextcloud/defaults/main.yml index b13c471..732cb18 100644 --- a/roles/nextcloud/defaults/main.yml +++ b/roles/nextcloud/defaults/main.yml @@ -1,8 +1,8 @@ --- # set preferred application version -nextcloud_version: 29-fpm-alpine +nextcloud_version: 30-fpm-alpine # set preferred postgres version -nextcloud_db_version: 12-alpine +nextcloud_db_version: 16-alpine nextcloud_upstream_file_dir: "{{ docker_stack_files_dir }}/{{ stack_name }}" diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml index 8275a71..05e9c38 100644 --- a/roles/nextcloud/tasks/main.yml +++ b/roles/nextcloud/tasks/main.yml @@ -16,14 +16,12 @@ state: directory mode: "0755" become: true - notify: "update nextcloud upstream" - name: Move webserver Caddyfile to target dir ansible.builtin.copy: src: "Caddyfile" dest: "{{ nextcloud_upstream_file_dir }}/Caddyfile" become: true - notify: "update nextcloud upstream" - name: Deploy to swarm community.general.docker_stack: @@ -35,4 +33,3 @@ become: true tags: - docker-swarm - notify: "update nextcloud upstream" From 36ff0fb5fa184121c6780f08e8062b347a165b39 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 28 Jan 2025 15:55:52 +0100 Subject: [PATCH 2/2] feat(nextcloud): Add imaginary container for thumbnails --- roles/nextcloud/templates/docker-stack.yml.j2 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/roles/nextcloud/templates/docker-stack.yml.j2 b/roles/nextcloud/templates/docker-stack.yml.j2 index 36526bc..80f28fa 100644 --- a/roles/nextcloud/templates/docker-stack.yml.j2 +++ b/roles/nextcloud/templates/docker-stack.yml.j2 @@ -142,6 +142,24 @@ services: networks: - backend + # from https://okxo.de/speed-up-nextcloud-preview-generation-with-imaginary/ + # and https://github.com/nextcloud/all-in-one/tree/main/Containers/imaginary + imaginary: + image: nextcloud/aio-imaginary:latest + environment: + - PORT=9000 + healthcheck: + test: ["CMD", "/healthcheck.sh"] + interval: 1m + timeout: 10s + retries: 3 + start_period: 1m + command: -return-size -max-allowed-resolution 222.2 -concurrency 50 -enable-url-source -log-level debug + cap_add: + - CAP_SYS_NICE + networks: + - backend + # metrics: # image: telegraf # hostname: "${HOSTNAME:-vmi352583.contaboserver.net}"