diff --git a/ansible/playbooks/saas/image.yml b/ansible/playbooks/saas/image.yml index 63b71eb..7b8fc85 100644 --- a/ansible/playbooks/saas/image.yml +++ b/ansible/playbooks/saas/image.yml @@ -38,14 +38,13 @@ - name: Debug latest version ansible.builtin.debug: msg: "{{ image_version }}" - verbosity: 1 - name: Build when: image_build block: - name: Build and publish image community.docker.docker_image_build: - name: "{{ docker_private_registry.url }}/{{ docker_private_registry.project is defined | ternary(docker_private_registry.project + '/', '') }}{{ image_name }}:{{ image_version }}" + name: "{{ docker_private_registry.url }}/{% if docker_private_registry.project is defined %}{{ docker_private_registry.project }}/{% endif %}{{ image_name }}:{{ image_version }}" tag: latest path: "/tmp/{{ catalog }}" dockerfile: Dockerfile diff --git a/ansible/playbooks/saas/operate.yml b/ansible/playbooks/saas/operate.yml index dbe72b4..d10aa5b 100644 --- a/ansible/playbooks/saas/operate.yml +++ b/ansible/playbooks/saas/operate.yml @@ -19,7 +19,7 @@ pre_tasks: - name: Get software variables ansible.builtin.set_fact: - software: "{{ lookup('simple-stack-ui', type='software', key=domain, subkey='', missing='warn') }}" + software: "{{ lookup('simple-stack-ui', type='software', key=domain, subkey='', missing='warn') | from_json }}" - debug: msg: "{{ software }}"