mount slurm.conf and slurmdbd.conf in host instead of building into i…

…mage

Dockerfile

@@ -62,8 +62,9 @@ RUN set -x \
     && popd \
     && rm -rf slurm \
     && groupadd -r --gid=990 slurm \
-    && useradd -r -g slurm --uid=990 slurm \
-    && mkdir /etc/sysconfig/slurm \
+    && useradd -r -g slurm --uid=990 slurm
+
+RUN mkdir /etc/sysconfig/slurm \
         /var/spool/slurmd \
         /var/run/slurmd \
         /var/run/slurmdbd \
@@ -81,17 +82,9 @@ RUN set -x \
         /var/lib/slurmd/qos_usage \
         /var/lib/slurmd/fed_mgr_state \
     && chown -R slurm:slurm /var/*/slurm* \
-    && chown -R slurm:slurm /etc/slurm \
-    && chmod -R 600 /etc/slurm \
     && /sbin/create-munge-key
 
-#COPY slurm.conf /etc/slurm/slurm.conf
-#COPY slurmdbd.conf /etc/slurm/slurmdbd.conf
-#RUN set -x \
-#    && chown slurm:slurm /etc/slurm/slurmdbd.conf \
-#    && chmod 600 /etc/slurm/slurmdbd.conf
-
-
+VOLUME /etc/slurm
 COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
 

docker-compose.yml

@@ -19,13 +19,11 @@ services:
       context: .
       args:
         SLURM_TAG: ${SLURM_TAG:-slurm-23.02}
-    #command: sh -c "set -x && chown slurm:slurm /etc/slurm/slurmdbd.conf && chmod 600 /etc/slurm/slurmdbd.conf && slurmdbd
     command: ["slurmdbd"]
     container_name: slurmdbd
     hostname: slurmdbd
     volumes:
       - etc_munge:/etc/munge
-      - etc_slurm:/etc/slurm
       - var_log_slurm:/var/log/slurm
       - ./slurm.conf:/etc/slurm/slurm.conf
       - ./slurmdbd.conf:/etc/slurm/slurmdbd.conf
@@ -41,11 +39,9 @@ services:
     hostname: slurmctld
     volumes:
       - etc_munge:/etc/munge
-      - etc_slurm:/etc/slurm
       - slurm_jobdir:/data
       - var_log_slurm:/var/log/slurm
       - ./slurm.conf:/etc/slurm/slurm.conf
-      - ./slurmdbd.conf:/etc/slurm/slurmdbd.conf
     expose:
       - "6817"
     depends_on:
@@ -58,11 +54,9 @@ services:
     container_name: c1
     volumes:
       - etc_munge:/etc/munge
-      - etc_slurm:/etc/slurm
       - slurm_jobdir:/data
       - var_log_slurm:/var/log/slurm
       - ./slurm.conf:/etc/slurm/slurm.conf
-      - ./slurmdbd.conf:/etc/slurm/slurmdbd.conf
     expose:
       - "6818"
     depends_on:
@@ -75,19 +69,16 @@ services:
     container_name: c2
     volumes:
       - etc_munge:/etc/munge
-      - etc_slurm:/etc/slurm
       - slurm_jobdir:/data
       - var_log_slurm:/var/log/slurm
       - ./slurm.conf:/etc/slurm/slurm.conf
-      - ./slurmdbd.conf:/etc/slurm/slurmdbd.conf
     expose:
       - "6818"
     depends_on:
       - "slurmctld"
 
 volumes:
   etc_munge:
-  etc_slurm:
   slurm_jobdir:
   var_lib_mysql:
   var_log_slurm:

docker-entrypoint.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -euo pipefail
 
 if [ "$1" = "slurmdbd" ]
 then
@@ -8,6 +8,8 @@ then
 
     echo "---> Starting the Slurm Database Daemon (slurmdbd) ..."
 
+    chown slurm:slurm /etc/slurm/slurmdbd.conf
+    chmod 600 /etc/slurm/slurmdbd.conf
     {
         . /etc/slurm/slurmdbd.conf
         until echo "SELECT 1" | mysql -h $StorageHost -u$StorageUser -p$StoragePass 2>&1 > /dev/null