Continue reworking docker setup

slurm/database/Dockerfile

@@ -1,51 +1,10 @@
-FROM rockylinux:8
+FROM clustercockpit/slurm.base:latest
 MAINTAINER Jan Eitzinger <jan.eitzinger@fau.de>
 
-ENV SLURM_VERSION=19.05.1 \
-  MUNGE_UID=981 \
-  SLURM_UID=982 \
-  WORKER_UID=1000
-
-RUN yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm -y
-
-RUN groupadd -g $MUNGE_UID munge \
-  && useradd  -m -c "MUNGE Uid 'N' Gid Emporium" -d /var/lib/munge -u $MUNGE_UID -g munge  -s /sbin/nologin munge \
-  && groupadd -g $SLURM_UID slurm \
-  && useradd  -m -c "Slurm workload manager" -d /var/lib/slurm -u $SLURM_UID -g slurm  -s /bin/bash slurm \
-  && groupadd -g $WORKER_UID worker \
-  && useradd  -m -c "Workflow user" -d /home/worker -u $WORKER_UID -g worker  -s /bin/bash worker
-
-RUN yum install -y munge munge-libs
-RUN dnf --enablerepo=powertools install munge-devel -y
-RUN yum install rng-tools -y
-
-RUN yum install -y python3 gcc openssl openssl-devel \
-pam-devel numactl numactl-devel hwloc sudo \
-lua readline-devel ncurses-devel man2html \
-libibmad libibumad rpm-build  perl-ExtUtils-MakeMaker.noarch rpm-build make wget
-
-RUN dnf --enablerepo=powertools install rrdtool-devel lua-devel hwloc-devel rpm-build -y
-RUN dnf install mariadb-server mariadb-devel -y
-RUN mkdir /usr/local/slurm-tmp
-RUN cd /usr/local/slurm-tmp
-RUN wget https://download.schedmd.com/slurm/slurm-22.05.6.tar.bz2
-RUN rpmbuild -ta slurm-22.05.6.tar.bz2
-
-
-ENV DBD_ADDR=database \
-  DBD_HOST=database \
-  DBD_PORT=6819 \
-  STORAGE_HOST=database.local.dev \
-  STORAGE_PORT=3306 \
-  STORAGE_PASS=password \
-  STORAGE_USER=slurm
+# clean up
+RUN rm -f /root/rpmbuild/RPMS/slurm-*.rpm \
+  && yum clean all \
+  && rm -rf /var/cache/yum
 
 COPY docker-entrypoint.sh /docker-entrypoint.sh
-VOLUME ["/home", "/.secret"]
-#   22:         SSH
-# 3306:         MariaDB
-# 6817:         Slurm Ctl D
-# 6818:         Slurm D
-# 6819:         Slurm DBD
-EXPOSE 22 3306 6817 6818 6819
 ENTRYPOINT ["/docker-entrypoint.sh"]

slurm/database/docker-entrypoint.sh

@@ -16,10 +16,10 @@ _sshd_host() {
 _slurm_acct_db() {
   {
     echo "create database slurm_acct_db;"
-    echo "create user '${STORAGE_USER}'@'${STORAGE_HOST}';"
-    echo "set password for '${STORAGE_USER}'@'${STORAGE_HOST}' = password('${STORAGE_PASS}');"
-    echo "grant usage on *.* to '${STORAGE_USER}'@'${STORAGE_HOST}';"
-    echo "grant all privileges on slurm_acct_db.* to '${STORAGE_USER}'@'${STORAGE_HOST}';"
+    echo "create user 'slurm'@slurmdb'';"
+    echo "set password for 'slurm'@'slurmdb' = password('demo');"
+    echo "grant usage on *.* to 'slurm'@'slurmdb';"
+    echo "grant all privileges on slurm_acct_db.* to 'slurm'@'slurmdb';"
     echo "flush privileges;"
   } >> $SLURM_ACCT_DB_SQL
 }
@@ -72,50 +72,6 @@ _wait_for_worker() {
   fi
 }
 
-# generate slurmdbd.conf
-_generate_slurmdbd_conf() {
-  cat > /etc/slurm/slurmdbd.conf <<EOF
-#
-# Example slurmdbd.conf file.
-#
-# See the slurmdbd.conf man page for more information.
-#
-# Archive info
-#ArchiveJobs=yes
-#ArchiveDir="/tmp"
-#ArchiveSteps=yes
-#ArchiveScript=
-#JobPurge=12
-#StepPurge=1
-#
-# Authentication info
-AuthType=auth/munge
-AuthInfo=/var/run/munge/munge.socket.2
-#
-# slurmDBD info
-DbdAddr=$DBD_ADDR
-DbdHost=$DBD_HOST
-DbdPort=$DBD_PORT
-SlurmUser=slurm
-#MessageTimeout=300
-DebugLevel=4
-#DefaultQOS=normal,standby
-LogFile=/var/log/slurm/slurmdbd.log
-PidFile=/var/run/slurmdbd.pid
-#PluginDir=/usr/lib/slurm
-#PrivateData=accounts,users,usage,jobs
-#TrackWCKey=yes
-#
-# Database info
-StorageType=accounting_storage/mysql
-StorageHost=$STORAGE_HOST
-StoragePort=$STORAGE_PORT
-StoragePass=$STORAGE_PASS
-StorageUser=$STORAGE_USER
-StorageLoc=slurm_acct_db
-EOF
-}
-
 # run slurmdbd
 _slurmdbd() {
   mkdir -p /var/spool/slurm/d \
@@ -123,8 +79,8 @@ _slurmdbd() {
   chown slurm: /var/spool/slurm/d \
     /var/log/slurm
   if [[ ! -f /home/config/slurmdbd.conf ]]; then
-    echo "### generate slurmdbd.conf ###"
-    _generate_slurmdbd_conf
+    echo "### Missing slurmdbd.conf ###"
+    exit
   else
     echo "### use provided slurmdbd.conf ###"
     cp /home/config/slurmdbd.conf /etc/slurm/slurmdbd.conf