Update slurm container setup

slurm/database/Dockerfile

@@ -1,4 +1,4 @@
-FROM clustercockpit/slurm.base:latest
+FROM clustercockpit/slurm.base:22.05.6
 MAINTAINER Jan Eitzinger <jan.eitzinger@fau.de>
 
 # clean up

slurm/database/docker-entrypoint.sh

@@ -12,32 +12,6 @@ _sshd_host() {
   /usr/sbin/sshd
 }
 
-# slurm database user settings
-_slurm_acct_db() {
-  {
-    echo "create database slurm_acct_db;"
-    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
-}
-
-# start database
-_mariadb_start() {
-  # mariadb somehow expects `resolveip` to be found under this path; see https://github.com/SciDAS/slurm-in-docker/issues/26
-  ln -s /usr/bin/resolveip /usr/libexec/resolveip
-  mysql_install_db
-  chown -R mysql: /var/lib/mysql/ /var/log/mariadb/ /var/run/mariadb
-  cd /var/lib/mysql
-  mysqld_safe --user=mysql &
-  cd /
-  _slurm_acct_db
-  sleep 5s
-  mysql -uroot < $SLURM_ACCT_DB_SQL
-}
-
 # start munge using existing key
 _munge_start_using_key() {
   if [ ! -f /.secret/munge.key ]; then
@@ -74,24 +48,28 @@ _wait_for_worker() {
 
 # run slurmdbd
 _slurmdbd() {
-  mkdir -p /var/spool/slurm/d \
-    /var/log/slurm
-  chown slurm: /var/spool/slurm/d \
-    /var/log/slurm
+   cd /root/rpmbuild/RPMS/aarch64
+   yum -y --nogpgcheck localinstall slurm-22.05.6-1.el8.aarch64.rpm \
+       slurm-perlapi-22.05.6-1.el8.aarch64.rpm \
+       slurm-slurmdbd-22.05.6-1.el8.aarch64.rpm
+  mkdir -p /var/spool/slurm/d /var/log/slurm /etc/slurm
+  chown slurm: /var/spool/slurm/d /var/log/slurm
   if [[ ! -f /home/config/slurmdbd.conf ]]; then
     echo "### Missing slurmdbd.conf ###"
     exit
   else
     echo "### use provided slurmdbd.conf ###"
     cp /home/config/slurmdbd.conf /etc/slurm/slurmdbd.conf
+    chown slurm: /etc/slurm/slurmdbd.conf
+    chmod 600 /etc/slurm/slurmdbd.conf
   fi
-  /usr/sbin/slurmdbd
+  echo "Starting slurmdbd"
   cp /etc/slurm/slurmdbd.conf /.secret/slurmdbd.conf
+  /usr/sbin/slurmdbd
 }
 
 ### main ###
 _sshd_host
-_mariadb_start
 _munge_start_using_key
 _wait_for_worker
 _slurmdbd