diff --git a/roles/server/defaults/main.yml b/roles/server/defaults/main.yml index f9448e0..2ce19de 100644 --- a/roles/server/defaults/main.yml +++ b/roles/server/defaults/main.yml @@ -20,9 +20,20 @@ nextcloud_database_pass: ~ nextcloud_database_host: localhost nextcloud_container_name: nextcloud -nextcloud_container_image: docker.io/library/nextcloud +nextcloud_container_image_server: docker.io +nextcloud_container_image_namespace: library +nextcloud_container_image_name: nextcloud +nextcloud_container_image: >-2 + {{ + [ + nextcloud_container_image_server, + nextcloud_container_image_namespace, + nextcloud_container_image_name, + ] | join('/') + }} nextcloud_container_image_variant: "-fpm-alpine" -nextcloud_container_image_ref: "{{ nextcloud_container_name }}:{{ nextcloud_version }}{{ nextcloud_container_image_variant }}" +nextcloud_container_image_ref: >-2 + {{ nextcloud_container_image }}:{{ nextcloud_version }}{{ nextcloud_container_image_variant }} nextcloud_container_image_force_source: false nextcloud_container_restart_policy: "unless-stopped" diff --git a/roles/server/tasks/main.yml b/roles/server/tasks/main.yml index 004b8fa..28657db 100644 --- a/roles/server/tasks/main.yml +++ b/roles/server/tasks/main.yml @@ -29,7 +29,7 @@ group: "{{ item.group }}" loop: "{{ nextcloud_paths }}" -- name: Ensure docker container for nextcloud is pulled +- name: Ensure docker container image '{{ nextcloud_container_image_ref }}' for nextcloud is pulled community.docker.docker_image: name: "{{ nextcloud_container_image_ref }}" state: present