From 13e163913a7fac2f62f5d44ac1bad50ef578ccf6 Mon Sep 17 00:00:00 2001 From: Jan Beilicke Date: Sun, 29 Oct 2023 11:32:14 +0100 Subject: [PATCH] Switches Nextcloud image to Alpine (#3) Co-authored-by: Jan Beilicke Reviewed-on: https://git.jotbe.io/jotbe/ansible-role-nextcloud-docker/pulls/3 --- tasks/main.yml | 11 ++++++++--- templates/docker-compose.nextcloud.yml.j2 | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 79d2fab..919b317 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -123,17 +123,22 @@ - name: "docker-compose: Set overwriteprotocol using occ" shell: chdir: /home/{{ docker_user }}/nextcloud/ - cmd: docker-compose exec -T -u www-data nextcloud-app /bin/bash -c './occ config:system:set overwriteprotocol --value="{{ nextcloud_overwrite_protocol }}"' + cmd: docker-compose exec -u www-data nextcloud-app /bin/sh -c './occ config:system:set overwriteprotocol --value="{{ nextcloud_overwrite_protocol }}"' - name: "docker-compose: Set overwrite.cli.url using occ" shell: chdir: /home/{{ docker_user }}/nextcloud/ - cmd: docker-compose exec -T -u www-data nextcloud-app /bin/bash -c './occ config:system:set overwrite.cli.url --value="{{ nextcloud_overwrite_cli_url }}"' + cmd: docker-compose exec -u www-data nextcloud-app /bin/sh -c './occ config:system:set overwrite.cli.url --value="{{ nextcloud_overwrite_cli_url }}"' - name: "docker-compose: Set overwritehost using occ" shell: - cmd: docker-compose exec -T -u www-data nextcloud-app /bin/bash -c './occ config:system:set overwritehost --value="{{ nextcloud_overwrite_host }}"' chdir: /home/{{ docker_user }}/nextcloud/ + cmd: docker-compose exec -u www-data nextcloud-app /bin/sh -c './occ config:system:set overwritehost --value="{{ nextcloud_overwrite_host }}"' + +- name: "docker-compose: Fix ownership of /var/www/html" + shell: + chdir: /home/{{ docker_user }}/nextcloud/ + cmd: "docker-compose exec --user root nextcloud-app /bin/sh -c 'chown -R www-data: /var/www/html'" - name: "Test whether Nextcloud is healthy from the outside" when: not ansible_check_mode diff --git a/templates/docker-compose.nextcloud.yml.j2 b/templates/docker-compose.nextcloud.yml.j2 index 57e2e21..3c62020 100644 --- a/templates/docker-compose.nextcloud.yml.j2 +++ b/templates/docker-compose.nextcloud.yml.j2 @@ -21,7 +21,7 @@ services: restart: unless-stopped nextcloud-app: - image: nextcloud:27-fpm + image: nextcloud:27-fpm-alpine container_name: nextcloud-app depends_on: - mysqldb