mirror of
https://github.com/ClusterCockpit/cc-docker.git
synced 2026-09-02 04:47:15 +02:00
Fix deps check. Readd mariadb
This commit is contained in:
@@ -6,3 +6,4 @@ data/cc-metric-store-source
|
|||||||
data/slurm
|
data/slurm
|
||||||
cc-backend/**
|
cc-backend/**
|
||||||
.vscode
|
.vscode
|
||||||
|
cc-backend
|
||||||
|
|||||||
@@ -59,6 +59,22 @@ services:
|
|||||||
restart: always
|
restart: always
|
||||||
command: --verbose start --optimized
|
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:
|
slurmctld:
|
||||||
container_name: slurmctld
|
container_name: slurmctld
|
||||||
hostname: slurmctld
|
hostname: slurmctld
|
||||||
|
|||||||
@@ -5,10 +5,10 @@ set -euo pipefail
|
|||||||
cd scripts
|
cd scripts
|
||||||
|
|
||||||
# Check if required perl modules are installed
|
# 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 "Perl Modules missing!"
|
||||||
echo -n "Stopped."
|
echo -n "Stopped."
|
||||||
exit
|
exit 1
|
||||||
else
|
else
|
||||||
echo "Perl Modules loaded."
|
echo "Perl Modules loaded."
|
||||||
fi
|
fi
|
||||||
@@ -17,7 +17,7 @@ fi
|
|||||||
if ! go version; then
|
if ! go version; then
|
||||||
echo "Golang not installed!"
|
echo "Golang not installed!"
|
||||||
echo -n "Stopped."
|
echo -n "Stopped."
|
||||||
exit
|
exit 1
|
||||||
else
|
else
|
||||||
echo "Golang installed."
|
echo "Golang installed."
|
||||||
fi
|
fi
|
||||||
@@ -26,7 +26,7 @@ fi
|
|||||||
if ! docker --version; then
|
if ! docker --version; then
|
||||||
echo "Docker not installed!"
|
echo "Docker not installed!"
|
||||||
echo -n "Stopped."
|
echo -n "Stopped."
|
||||||
exit
|
exit 1
|
||||||
else
|
else
|
||||||
echo "Docker installed."
|
echo "Docker installed."
|
||||||
fi
|
fi
|
||||||
@@ -35,7 +35,7 @@ fi
|
|||||||
if ! npm --version; then
|
if ! npm --version; then
|
||||||
echo "NPM not installed!"
|
echo "NPM not installed!"
|
||||||
echo -n "Stopped."
|
echo -n "Stopped."
|
||||||
exit
|
exit 1
|
||||||
else
|
else
|
||||||
echo "NPM installed."
|
echo "NPM installed."
|
||||||
fi
|
fi
|
||||||
@@ -44,7 +44,7 @@ fi
|
|||||||
if ! make --version; then
|
if ! make --version; then
|
||||||
echo "Make not installed!"
|
echo "Make not installed!"
|
||||||
echo -n "Stopped."
|
echo -n "Stopped."
|
||||||
exit
|
exit 1
|
||||||
else
|
else
|
||||||
echo "Make installed."
|
echo "Make installed."
|
||||||
fi
|
fi
|
||||||
@@ -53,7 +53,7 @@ fi
|
|||||||
if ! gcc --version; then
|
if ! gcc --version; then
|
||||||
echo "GCC not installed!"
|
echo "GCC not installed!"
|
||||||
echo -n "Stopped."
|
echo -n "Stopped."
|
||||||
exit
|
exit 1
|
||||||
else
|
else
|
||||||
echo "GCC installed."
|
echo "GCC installed."
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -29,9 +29,9 @@ for my $code (@modules) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($fail) {
|
if ($fail) {
|
||||||
exit 0;
|
|
||||||
} else {
|
|
||||||
exit 1;
|
exit 1;
|
||||||
|
} else {
|
||||||
|
exit 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
sub help
|
sub help
|
||||||
|
|||||||
Reference in New Issue
Block a user