Merge pull request #72 from scalableminds/add-slurmrestd

add slurmrestd

Author: robert-oleynik

slurm-docker-cluster/Dockerfile

@@ -7,6 +7,8 @@ FROM debian:bookworm
 ARG SLURM_VERSION="24.05.4"
 ARG SLURM_USER_UID=990
 ARG SLURM_USER_GID=990
+ARG SLURMRESTD_USER_UID=65533
+ARG SLURMRESTD_USER_GID=65533
 ARG MYSQL_CONFIG_VERSION="0.8.34"
 
 COPY --from=uv /uv /bin/uv
@@ -21,7 +23,7 @@ RUN set -xe \
 	&& apt-get update \
 	&& apt-get install --yes mysql-server
 
-RUN bash -c "set -xe && for package in 'smd' 'smd-client' 'smd-slurmd' 'smd-slurmctld' 'smd-slurmdbd' 'smd-sview'; do \
+RUN bash -c "set -xe && for package in 'smd' 'smd-client' 'smd-slurmd' 'smd-slurmctld' 'smd-slurmdbd' 'smd-slurmrestd' 'smd-sview'; do \
 	curl -Lo \"/tmp/slurm-\${package}.deb\" https://github.com/scalableminds/slurm-packages/releases/download/${SLURM_VERSION}/slurm-\${package}_${SLURM_VERSION}-1_amd64.deb; \
 done"
 RUN apt-get install --yes -f /tmp/*.deb
@@ -46,6 +48,9 @@ COPY --chown=slurm:slurm slurmdbd.conf /etc/slurm/slurmdbd.conf
 RUN chmod 600 /etc/slurm/slurm.conf
 RUN chmod 600 /etc/slurm/slurmdbd.conf
 
+RUN addgroup --gid="$SLURMRESTD_USER_GID" slurmrestd
+RUN adduser --system --uid="$SLURMRESTD_USER_UID" --ingroup slurmrestd slurmrestd
+
 COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
 CMD ["slurmdbd"]

slurm-docker-cluster/docker-entrypoint.sh

@@ -41,9 +41,18 @@ then
     { echo "---> Starting the MUNGE Authentication service (munged) ..."; } 2>/dev/null
     setpriv --reuid=munge --regid=munge --init-groups /usr/sbin/munged
 
-    { echo "---> Starting the Slurm Node Daemon (slurmd) ..."; } 1>/dev/null
+    { echo "---> Starting the Slurm Node Daemon (slurmd) ..."; } 2>/dev/null
     exec /usr/sbin/slurmd -D
 fi
 
+if [ "$1" = "slurmrestd" ]
+then
+    shift 1
+    set -x
+
+    { echo "---> Starting the Slurm Restd (slurmrestd) ..."; } 2>/dev/null
+    exec setpriv --reuid=slurmrestd --regid=slurmrestd --init-groups /usr/sbin/slurmrestd "$@"
+fi
+
 set -x
 exec "$@"