container: reorganize volume directory creation

roles/container/tasks/main.yml

@@ -46,7 +46,7 @@
     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'
+  when: create_opt_directory
 
 - name: Container image
   import_tasks: image.yml
@@ -55,6 +55,25 @@
   include_tasks: host_user.yml
   when: docker_host_user
 
+- name: Create suffix directory
+  when: create_opt_directory and docker_service_suffix is defined
+  block:
+    - 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) }}"
+        mode: 0755
+    - name: Set container_workdir variable
+      set_fact:
+        container_workdir: /opt/{{ docker_service }}/{{ docker_service_suffix }}
+
+- name: Set container_workdir variable
+  set_fact:
+    container_workdir: /opt/{{ docker_service }}
+  when: docker_service_suffix is not defined
+
 - name: Container volumes
   import_tasks: volumes.yml