build cobald image from slurm role, separated tags

roles/cobald/tasks/dockerimage-generic.yml

@@ -0,0 +1,34 @@
+- file:
+    path: "/container/docker-images/cobald.{{cobald_image_tag|default('latest')}}/"
+    state: directory
+    owner: "{{unpriv_user}}"
+    group: docker
+
+- template:
+    src: cobald.Dockerfile
+    dest: "/container/docker-images/cobald.{{cobald_image_tag|default('latest')}}/Dockerfile"
+    owner: "{{unpriv_user}}"
+    group: docker
+  register: cobald_cp_dockerfile
+
+- copy:
+    src: "{{item}}"
+    dest: "/container/docker-images/cobald.{{cobald_image_tag|default('latest')}}/{{item}}"
+    owner: "{{unpriv_user}}"
+    group: docker
+    mode: 0755
+  with_items:
+  - cobald-entrypoint.sh
+  - init-cobaldmodules.sh
+  register: cobald_cp_files
+
+- docker_image:
+    name: "cobald"
+    tag: "{{cobald_image_tag|default('latest')}}"
+#    pull: False
+    build:
+      pull: False
+      path: "/container/docker-images/cobald.{{cobald_image_tag|default('latest')}}/"
+    source: build
+    force_source: "{{cobald_cp_dockerfile.changed or cobald_cp_files.changed}}"
+

roles/cobald/tasks/main.yml

@@ -1,46 +1,29 @@
 - include_vars: cobald-slurm.yml
   when: cobald_slurm | default(False)
 
-# FIXME: replace below by
-# - include_role: slurm
-#     tasks_from: dockerimage
-- file:
-    path: "/container/{{item.name}}/cobald{{item.pfx|default('')}}/"
+- include_role:
+    name: slurm
+    tasks_from: dockerimage
+  vars:
+    slurm_image_prefix: cobald
+    image_name: "{{cobald_image_tag}}"
+    dockerfile: "{{ lookup('template', 'cobald.Dockerfile') }}"
+    files:
+    - dest: cobald-entrypoint.sh
+      content: "{{ lookup('file', 'cobald-entrypoint.sh') }}"
+    - dest: init-cobaldmodules.sh
+      content: "{{ lookup('file', 'init-cobaldmodules.sh') }}"
+  when: cobald_slurm | default(False)
+
+- include_tasks: dockerimage-generic.yml
+  when: not (cobald_slurm | default(False))
+
+- name: make cobald data volume
+  file:
+    path: "/container/volumes/cobald/"
     state: directory
     owner: "{{unpriv_user}}"
     group: docker
-  loop:
-  - name: docker-images
-    pfx: ".{{cobald_image_tag|default('latest')}}"
-  - name: volumes
-
-- template:
-    src: cobald.Dockerfile
-    dest: "/container/docker-images/cobald.{{cobald_image_tag|default('latest')}}/Dockerfile"
-    owner: "{{unpriv_user}}"
-    group: docker
-  register: cobald_cp_dockerfile
-
-- copy:
-    src: "{{item}}"
-    dest: "/container/docker-images/cobald.{{cobald_image_tag|default('latest')}}/{{item}}"
-    owner: "{{unpriv_user}}"
-    group: docker
-    mode: 0755
-  with_items:
-  - cobald-entrypoint.sh
-  - init-cobaldmodules.sh
-  register: cobald_cp_files
-
-- docker_image:
-    name: "cobald"
-    tag: "{{cobald_image_tag|default('latest')}}"
-#    pull: False
-    build:
-      pull: False
-      path: "/container/docker-images/cobald.{{cobald_image_tag|default('latest')}}/"
-    source: build
-    force_source: "{{cobald_cp_dockerfile.changed or cobald_cp_files.changed}}"
 
 - copy:
     src: cobald-config/