container: small fixes

roles/container/tasks/image.yml

@@ -34,7 +34,7 @@
     source: pull
     force_source: true
   register: pulled_image
-  when: dockerfile is not defined or dockerfile | length == 0
+  when: not dockerfile_needed
 
 - name: Set container_image variable
   set_fact:

roles/container/tasks/volumes.yml

@@ -14,12 +14,12 @@
         state: directory
         owner: "{{ mount_owner if (item.set_owner is not defined or item.set_owner) and mount_owner | length > 0 else omit }}"
         group: "{{ mount_group if (item.set_group is not defined or item.set_group) and mount_group | length > 0 else omit }}"
-      when: item.name is defined
+      when: item.name is defined and docker_volume_type == 'bind'
       loop: "{{ docker_mounts }}"
     - name: Set docker_volume_definition for named binds
       set_fact:
         docker_volume_definition: "{{ docker_volume_definition + [{'source': docker_mounts_dir + '/' + item.name, 'target': item.path, 'type': 'bind'}] }}"
-      when: item.name is defined
+      when: item.name is defined and docker_volume_type == 'bind'
       loop: "{{ docker_mounts }}"
 
     - name: Template docker template mounts for {{ docker_service_name }}