From 3359f912f005168e0d624b42540c231c5c538c2d Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 10 Oct 2020 20:56:49 +0200 Subject: nextcloud: add app user to custom images --- roles/apps/nextcloud/tasks/custom-image.yml | 7 +++++++ roles/apps/nextcloud/tasks/main.yml | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'roles/apps/nextcloud/tasks') diff --git a/roles/apps/nextcloud/tasks/custom-image.yml b/roles/apps/nextcloud/tasks/custom-image.yml index 6702d70b..5aac75e0 100644 --- a/roles/apps/nextcloud/tasks/custom-image.yml +++ b/roles/apps/nextcloud/tasks/custom-image.yml @@ -8,7 +8,14 @@ copy: content: | FROM {{ item.value.custom_image.from | default('nextcloud:' + item.value.version) }} + + RUN set -x \ + && addgroup --gid {{ nextcloud_app_gid }} nc-app \ + && adduser --uid {{ nextcloud_app_uid }} --gid {{ nextcloud_app_gid }} --system --no-create-home --home /var/www/html --disabled-login --disabled-password nc-app + {% if 'custom_image' in item.value %} + {{ item.value.custom_image.dockerfile }} + {% endif %} dest: "{{ nextcloud_base_path }}/{{ item.key }}/build/Dockerfile" register: nextcloud_custom_image_docker diff --git a/roles/apps/nextcloud/tasks/main.yml b/roles/apps/nextcloud/tasks/main.yml index c2dcf8d9..d09773ab 100644 --- a/roles/apps/nextcloud/tasks/main.yml +++ b/roles/apps/nextcloud/tasks/main.yml @@ -99,7 +99,7 @@ loop: "{{ nextcloud_instances | dict2items }}" loop_control: label: "{{ item.key }}" - when: "'custom_image' in item.value" + # when: "'custom_image' in item.value" include_tasks: custom-image.yml - name: install pod manifest @@ -118,6 +118,9 @@ - path: "{{ nextcloud_base_path }}/{{ item.key }}/config/ports.conf" properties: - checksum + - path: "{{ nextcloud_base_path }}/{{ item.key }}/build/Dockerfile" + properties: + - checksum include_role: name: kubernetes/standalone/pod -- cgit v1.2.3