Skip to content

Commit

Permalink
Merge branch 'BerkhanBerkdemir-docker-gen_flatten_directories'
Browse files Browse the repository at this point in the history
  • Loading branch information
drybjed committed Oct 15, 2024
2 parents 73cb816 + b978953 commit 95ff654
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,13 @@ General
- Fixed an issue with the vhost ``state: "absent"`` parameter not working
correctly when the ``enabled: False`` parameter was not set as well.

:ref:`debops.docker_gen` role
'''''''''''''''''''''''''''''

- Flattened the list of directories that are created by the ``file`` task. This
should fix the issue of Ansible stopping during execution due to nested lists
in the ``loop`` keyword.

:ref:`debops.dropbear_initramfs` role
'''''''''''''''''''''''''''''''''''''

Expand Down
10 changes: 6 additions & 4 deletions ansible/roles/docker_gen/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@
group: 'root'
mode: '0755'
loop:
- [ '{{ docker_gen__src }}', '{{ docker_gen__lib }}', '{{ docker_gen__templates }}' ]
- [ '{{ ((docker_gen__nginx_dest | dirname)
if (docker_gen__nginx | d() and docker_gen__nginx)
else []) }}' ]
- '{{ docker_gen__src }}'
- '{{ docker_gen__lib }}'
- '{{ docker_gen__templates }}'
- '{{ ((docker_gen__nginx_dest | dirname)
if (docker_gen__nginx | d() and docker_gen__nginx)
else []) }}'

- name: Download docker-gen sources
ansible.builtin.get_url:
Expand Down

0 comments on commit 95ff654

Please sign in to comment.