WIP: separate slurm base and docker images

roles/slurm/files/slurmctld.Dockerfile

@@ -1,38 +1,11 @@
-FROM docker.io/library/centos:7
-
-RUN yum install -y epel-release && \
-	yum install -y slurm && \
-	yum clean all && rm -rf /var/cache/yum
-
-RUN	yum install -y less iproute bind-utils nmap-ncat net-tools && \
-	yum clean all && rm -rf /var/cache/yum
-
-# FIXME
-COPY entrypoint.sh /usr/local/sbin/entrypoint.sh
-
-RUN chown root:root /usr/local/sbin/entrypoint.sh && \
-	chmod 755 /usr/local/sbin/entrypoint.sh
-
-ENTRYPOINT [ "/usr/local/sbin/entrypoint.sh" ]
-
-ARG slurmuser=slurm
-ENV slurmuser=${slurmuser}
-
-RUN useradd -d /var/lib/slurm -m --no-log-init --system $slurmuser &&\
-	slurm-setuser -u $slurmuser -g $slurmuser -y
+FROM slurm:base
 
 RUN	yum install -y slurm-slurmctld && \
 	yum clean all && rm -rf /var/cache/yum
 
-COPY docker-init /usr/local/sbin/docker-init
-RUN mkdir /etc/docker-init.d  && chmod 755 /usr/local/sbin/docker-init
-# FIXME
-COPY start-scripts/10-munge /etc/docker-init.d/
-COPY start-scripts/20-slurmctld /etc/docker-init.d/
-RUN chmod 755 /etc/docker-init.d/*
+COPY start-scripts/20-slurmctld /etc/docker-init.d/20-slurmctld
+RUN chmod 755 /etc/docker-init.d/20-slurmctld
 
 ENV SLURMCTLD_LOG_PATH="/var/log/slurm/slurmctld.log"
 ENV SLURMD_LOG_PATH="/var/log/slurm/slurmd.log"
 ENV SLURM_SCHED_LOG_PATH="/var/log/slurm/slurmsched.log"
-
-CMD /usr/local/sbin/docker-init

roles/slurm/files/slurmd.Dockerfile

@@ -1,38 +1,11 @@
-FROM docker.io/library/centos:7
-
-RUN yum install -y epel-release && \
-	yum install -y slurm && \
-	yum clean all && rm -rf /var/cache/yum
-
-RUN	yum install -y less iproute bind-utils nmap-ncat net-tools && \
-	yum clean all && rm -rf /var/cache/yum
-
-# FIXME
-COPY entrypoint.sh /usr/local/sbin/entrypoint.sh
-
-RUN chown root:root /usr/local/sbin/entrypoint.sh && \
-	chmod 755 /usr/local/sbin/entrypoint.sh
-
-ENTRYPOINT [ "/usr/local/sbin/entrypoint.sh" ]
-
-ARG slurmuser=slurm
-ENV slurmuser=${slurmuser}
-
-RUN useradd -d /var/lib/slurm -m --no-log-init --system $slurmuser &&\
-	slurm-setuser -u $slurmuser -g $slurmuser -y
+FROM slurm:base
 
 RUN yum install -y slurm-slurmd && \
 	yum clean all && rm -rf /var/cache/yum
 
-COPY docker-init /usr/local/sbin/docker-init
-RUN mkdir /etc/docker-init.d  && chmod 755 /usr/local/sbin/docker-init
-# FIXME
-COPY start-scripts/10-munge /etc/docker-init.d/
-COPY start-scripts/30-slurmd /etc/docker-init.d/
-RUN chmod 755 /etc/docker-init.d/*
+COPY start-scripts/30-slurmd /etc/docker-init.d/30-slurmd
+RUN chmod 755 /etc/docker-init.d/30-slurmd
 
 ENV SLURMCTLD_LOG_PATH="/var/log/slurm/slurmctld.log"
 ENV SLURMD_LOG_PATH="/var/log/slurm/slurmd.log"
 ENV SLURM_SCHED_LOG_PATH="/var/log/slurm/slurmsched.log"
-
-CMD /usr/local/sbin/docker-init

roles/slurm/files/start-scripts/10-munge

@@ -1,2 +0,0 @@
-#!/bin/sh
-exec su -s /bin/sh -c "munged -F" munge

roles/slurm/tasks/main.yml

@@ -3,19 +3,24 @@
     name: [ slurm, slurm-doc ]
     state: present
 
-- include_tasks: dockerimage.yml
+- include_role:
+    name: slurm_dockerimage
   loop:
   - name: slurmctld
-    start:
-    - 10-munge
-    - 20-slurmctld
+    dockerfile: "{{ lookup('file', 'slurmctld.Dockerfile') }}"
+    start_scripts:
+    - name: 20-slurmctld
+      content: "{{ lookup('file', 'start-scripts/20-slurmctld') }}"
   - name: slurmd
-    start:
-    - 10-munge
-    - 30-slurmd
+    dockerfile: "{{ lookup('file', 'slurmd.Dockerfile') }}"
+    start_scripts:
+    - name: 30-slurmd
+      content: "{{ lookup('file', 'start-scripts/30-slurmd') }}"
   loop_control:
     loop_var: image
     label: "{{ image.name }}"
+  vars:
+    build_base: True
 
 - name: generate munge key
   shell:
@@ -78,6 +83,10 @@
       image: slurm:slurmd
       extra_mounts:
       - "/home/{{unpriv_user}}/job3/:/mnt/:rw"
+#    - machine: slurm-cobald
+#      image: slurm-cobald
+#      extra_mounts:
+#      # TODO
   tags: [ slurm-config ]
 
 # TODO: reserve some address using docker_network_info and assign as aux