Update galaxy.yml, make ansible-lint happier

roles/container/meta/main.yml

@@ -1,4 +1,4 @@
 ---
 
 dependencies:
-  - docker
+  - role: docker

roles/container/tasks/main.yml

@@ -6,6 +6,7 @@
   when: docker_service_suffix is defined
 
 - name: Convert docker_volumes from legacy format
+  when: docker_volumes is defined and docker_volumes[0] is not mapping
   block:
     - name: Warn about docker_volumes legacy format
       debug:
@@ -13,20 +14,19 @@
 
     - name: Add legacy docker volumes to docker_volumes_new using the new format
       set_fact:
-        docker_volumes_new: "{{ docker_volumes_new | default([]) + [{ 'name': item.split(':')[0], 'path': item.split(':')[1] }] }}"
+        docker_volumes_new: "{{ docker_volumes_new | default([]) + [{'name': item.split(':')[0], 'path': item.split(':')[1]}] }}"
       when: "'/' not in item.split(':')[0]"
       loop: "{{ docker_volumes }}"
     - name: Add legacy docker src bind mounts to docker_volumes_new using the new format
       set_fact:
-        docker_volumes_new: "{{ docker_volumes_new | default([]) + [{ 'src': item.split(':')[0], 'path': item.split(':')[1] }] }}"
+        docker_volumes_new: "{{ docker_volumes_new | default([]) + [{'src': item.split(':')[0], 'path': item.split(':')[1]}] }}"
       when: "'/' in item.split(':')[0]"
       loop: "{{ docker_volumes }}"
     - name: Set final_docker_volumes variable
       set_fact:
         final_docker_volumes: "{{ docker_volumes_new }}"
-  when: docker_volumes is defined and docker_volumes[0] is not mapping
 
-- name: "{{ docker_service_name }} docker network"
+- name: Docker network {{ docker_service_name }}
   docker_network:
     name: "{{ docker_service_name }}"
   when: docker_network_mode is not defined or docker_network_mode != 'host'
@@ -38,7 +38,7 @@
   when: docker_network_mode is not defined or docker_network_mode != 'host'
 
 - name: Reverse proxy
-  include_role: 
+  include_role:
     name: uumas.general.reverse_proxy
   vars:
     vhost_id: "{{ docker_service_name }}"
@@ -48,7 +48,7 @@
   when: reverse_proxy_type != 'none' and reverse_proxy_type != 'traefik'
 
 - name: Set published ports variable
-  set_fact: 
+  set_fact:
     container_published_ports: ["127.0.0.1:{{ ports[docker_service_name][docker_proxy_target_protocol] }}:{{ docker_image_http_port }}"]
   when: reverse_proxy_type != 'traefik' and (docker_network_mode is not defined or docker_network_mode != 'host')
 
@@ -57,6 +57,7 @@
   when: reverse_proxy_type == 'traefik'
 
 - name: Database container
+  when: docker_database is defined
   block:
     - name: Set postgres container vars
       set_fact:
@@ -88,11 +89,11 @@
         db_published_ports: ["127.0.0.1:{{ ports[docker_service_name].db }}:{{ db_image_port }}"]
       when: ports[docker_service_name].db is defined
 
-    - name: "{{ docker_database }} database container for {{ docker_service_name }}"
+    - name: Database container for {{ docker_service_name + ' (' + docker_database + ')' }}
       docker_container:
         name: "{{ docker_service_name }}_db"
         image: "{{ db_container_image }}"
-        pull: yes
+        pull: true
         env: "{{ db_container_env | default(omit) }}"
         published_ports: "{{ db_published_ports | default(omit) }}"
         restart_policy: always
@@ -100,33 +101,35 @@
           - "{{ docker_service_name }}_db:{{ db_container_data }}"
         networks: "{{ container_networks | default(omit) }}"
         log_driver: local
-  when: docker_database is defined
 
 - name: Additional services
+  when: docker_additional_services is defined
   block:
     - name: "Memcached container for {{ docker_service_name }}"
       docker_container:
         name: "{{ docker_service_name }}_memcached"
         image: memcached:alpine
-        pull: yes
+        pull: true
         restart_policy: always
         networks: "{{ container_networks | default(omit) }}"
         log_driver: local
       when: "'memcached' in docker_additional_services"
-  when: docker_additional_services is defined
 
-- name: "Create /opt/{{ docker_service }} directory"
+- name: Create directory /opt/{{ docker_service }}
   file:
     path: "/opt/{{ docker_service }}"
     state: directory
+    mode: 0755
   when: (dockerfile is defined and dockerfile | length > 0) or docker_host_user or docker_volume_type == 'bind'
 
 - name: Image build
+  when: dockerfile is defined and dockerfile | length > 0
   block:
     - name: Put dockerfile in place
       template:
         src: Dockerfile.j2
         dest: "/opt/{{ docker_service }}/Dockerfile"
+        mode: 0644
 
     - name: Build docker image for {{ docker_service }}
       docker_image:
@@ -137,9 +140,9 @@
           pull: true
           path: "/opt/{{ docker_service }}"
       register: docker_built_image
-  when: dockerfile is defined and dockerfile | length > 0
 
 - name: Container user
+  when: docker_host_user
   block:
     - name: "Create user for {{ docker_service_name }}"
       user:
@@ -153,18 +156,19 @@
     - name: Set docker container user
       set_fact:
         docker_user: "{{ user.uid }}:{{ user.group }}"
-  when: docker_host_user
 
 - name: Bind mounts
+  when: "docker_volume_type == 'bind'"
   block:
-    - name: "Create /opt/{{ docker_service }}/{{ docker_service_suffix }} directory"
+    - name: Create directory /opt/{{ docker_service + '/' + docker_service_suffix }}
       file:
         path: "/opt/{{ docker_service }}/{{ docker_service_suffix }}"
         state: directory
         owner: "{{ user.uid | default(omit) }}"
-        group: "{{ user.group | default(omit)}}"
+        group: "{{ user.group | default(omit) }}"
+        mode: 0755
       when: docker_service_suffix is defined
-  
+
     - name: Set docker_mounts_dir
       set_fact:
         docker_mounts_dir: "/opt/{{ docker_service }}/{{ docker_service_suffix }}/mounts"
@@ -174,10 +178,11 @@
         docker_mounts_dir: "/opt/{{ docker_service }}/mounts"
       when: docker_service_suffix is not defined
 
-    - name: "Create {{ docker_mounts_dir }} directory"
+    - name: Create directory {{ docker_mounts_dir }}
       file:
         path: "{{ docker_mounts_dir }}"
         state: directory
+        mode: 0755
 
     - name: "Create docker bind mount directories for {{ docker_service_name }}"
       file:
@@ -194,7 +199,6 @@
         docker_volume_definition: "{{ docker_volume_definition | default([]) + [docker_mounts_dir + '/' + item.name + ':' + item.path] }}"
       when: item.name is defined
       loop: "{{ docker_volumes }}"
-  when: "docker_volume_type == 'bind'"
 
 - name: Set docker_volume_definition for src binds
   set_fact:
@@ -232,4 +236,3 @@
     mode: 0750
   when: "docker_volume_type == 'bind' and item.name is defined"
   loop: "{{ final_docker_volumes }}"
-