From a2e7c62115e70209eb0545613c072f2ef74044a5 Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Mon, 22 Jun 2026 09:53:05 +0200 Subject: [PATCH] Fix deps check. Readd mariadb --- .gitignore | 1 + docker-compose.yml | 16 ++++++++++++++++ scripts/checkModules.sh | 14 +++++++------- scripts/checkPerlModules.pl | 4 ++-- 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index c354d48..e1a840e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ data/cc-metric-store-source data/slurm cc-backend/** .vscode +cc-backend diff --git a/docker-compose.yml b/docker-compose.yml index 08b656d..8269c8d 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -59,6 +59,22 @@ services: restart: always command: --verbose start --optimized + mariadb: + container_name: mariadb + image: mariadb:latest + command: ["--default-authentication-plugin=mysql_native_password"] + environment: + MARIADB_ROOT_PASSWORD: root + MARIADB_DATABASE: slurm_acct_db + MARIADB_USER: slurm + MARIADB_PASSWORD: demo + ports: + - "0.0.0.0:3306:3306" + volumes: + - ${DATADIR}/mariadb:/docker-entrypoint-initdb.d + cap_add: + - SYS_NICE + slurmctld: container_name: slurmctld hostname: slurmctld diff --git a/scripts/checkModules.sh b/scripts/checkModules.sh index ac90e74..8269cd7 100755 --- a/scripts/checkModules.sh +++ b/scripts/checkModules.sh @@ -5,10 +5,10 @@ set -euo pipefail cd scripts # Check if required perl modules are installed -if ./checkPerlModules.pl ../migrateTimestamps.pl | grep "couldn't load"; then +if ! ./checkPerlModules.pl ../migrateTimestamps.pl; then echo "Perl Modules missing!" echo -n "Stopped." - exit + exit 1 else echo "Perl Modules loaded." fi @@ -17,7 +17,7 @@ fi if ! go version; then echo "Golang not installed!" echo -n "Stopped." - exit + exit 1 else echo "Golang installed." fi @@ -26,7 +26,7 @@ fi if ! docker --version; then echo "Docker not installed!" echo -n "Stopped." - exit + exit 1 else echo "Docker installed." fi @@ -35,7 +35,7 @@ fi if ! npm --version; then echo "NPM not installed!" echo -n "Stopped." - exit + exit 1 else echo "NPM installed." fi @@ -44,7 +44,7 @@ fi if ! make --version; then echo "Make not installed!" echo -n "Stopped." - exit + exit 1 else echo "Make installed." fi @@ -53,7 +53,7 @@ fi if ! gcc --version; then echo "GCC not installed!" echo -n "Stopped." - exit + exit 1 else echo "GCC installed." fi diff --git a/scripts/checkPerlModules.pl b/scripts/checkPerlModules.pl index 675024a..040c248 100755 --- a/scripts/checkPerlModules.pl +++ b/scripts/checkPerlModules.pl @@ -29,9 +29,9 @@ for my $code (@modules) { } if ($fail) { - exit 0; -} else { exit 1; +} else { + exit 0; } sub help