mirror of
https://github.com/ClusterCockpit/cc-docker.git
synced 2025-03-15 11:25:56 +01:00
Fixed docker-entrypoint.sh scripts
This commit is contained in:
parent
cf13ee5e7e
commit
c646309a25
4
.gitignore
vendored
4
.gitignore
vendored
@ -3,6 +3,10 @@ data/job-archive/**
|
|||||||
data/influxdb
|
data/influxdb
|
||||||
data/sqldata
|
data/sqldata
|
||||||
data/cc-metric-store
|
data/cc-metric-store
|
||||||
|
data/cc-metric-store-source
|
||||||
|
data/ldap
|
||||||
|
data/mariadb
|
||||||
|
data/slurm
|
||||||
cc-backend
|
cc-backend
|
||||||
cc-backend/**
|
cc-backend/**
|
||||||
.vscode
|
.vscode
|
||||||
|
2
docker-compose.yml
Normal file → Executable file
2
docker-compose.yml
Normal file → Executable file
@ -104,6 +104,8 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- ${DATADIR}/slurm/home:/home
|
- ${DATADIR}/slurm/home:/home
|
||||||
- ${DATADIR}/slurm/secret:/.secret
|
- ${DATADIR}/slurm/secret:/.secret
|
||||||
|
- ./slurm/worker/cgroup.conf:/home/config/cgroup.conf
|
||||||
|
- ./slurm/controller/slurm.conf:/home/config/slurm.conf
|
||||||
ports:
|
ports:
|
||||||
- "6818:6818"
|
- "6818:6818"
|
||||||
|
|
||||||
|
0
env-template.txt
Normal file → Executable file
0
env-template.txt
Normal file → Executable file
25
setupDev.sh
25
setupDev.sh
@ -1,4 +1,20 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
echo ""
|
||||||
|
echo "-----------------------------------------------------------------"
|
||||||
|
echo "Welcome to cc-docker automatic deployment script."
|
||||||
|
echo "Make sure you have sudo rights to run docker services"
|
||||||
|
echo "This script assumes that docker command is added to sudo group"
|
||||||
|
echo "This means that docker commands do not explicitly require"
|
||||||
|
echo "'sudo' keyword to run. You can use this following command:"
|
||||||
|
echo ""
|
||||||
|
echo "sudo groupadd docker"
|
||||||
|
echo "sudo usermod -aG docker $USER"
|
||||||
|
echo ""
|
||||||
|
echo "This will add docker to the sudo usergroup and all the docker"
|
||||||
|
echo "command will run as sudo by default without requiring"
|
||||||
|
echo "'sudo' keyword."
|
||||||
|
echo "-----------------------------------------------------------------"
|
||||||
|
echo ""
|
||||||
|
|
||||||
# Check cc-backend, touch job.db if exists
|
# Check cc-backend, touch job.db if exists
|
||||||
if [ ! -d cc-backend ]; then
|
if [ ! -d cc-backend ]; then
|
||||||
@ -7,8 +23,6 @@ if [ ! -d cc-backend ]; then
|
|||||||
exit
|
exit
|
||||||
else
|
else
|
||||||
cd cc-backend
|
cd cc-backend
|
||||||
make
|
|
||||||
|
|
||||||
if [ ! -d var ]; then
|
if [ ! -d var ]; then
|
||||||
wget https://hpc-mover.rrze.uni-erlangen.de/HPC-Data/0x7b58aefb/eig7ahyo6fo2bais0ephuf2aitohv1ai/job-archive-demo.tar
|
wget https://hpc-mover.rrze.uni-erlangen.de/HPC-Data/0x7b58aefb/eig7ahyo6fo2bais0ephuf2aitohv1ai/job-archive-demo.tar
|
||||||
tar xf job-archive-demo.tar
|
tar xf job-archive-demo.tar
|
||||||
@ -17,6 +31,8 @@ else
|
|||||||
cp ./configs/env-template.txt .env
|
cp ./configs/env-template.txt .env
|
||||||
cp ./configs/config-demo.json config.json
|
cp ./configs/config-demo.json config.json
|
||||||
|
|
||||||
|
make
|
||||||
|
|
||||||
./cc-backend -migrate-db
|
./cc-backend -migrate-db
|
||||||
./cc-backend --init-db --add-user demo:admin:AdminDev
|
./cc-backend --init-db --add-user demo:admin:AdminDev
|
||||||
cd ..
|
cd ..
|
||||||
@ -28,6 +44,8 @@ else
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
mkdir -m777 data
|
||||||
|
|
||||||
# Download unedited checkpoint files to ./data/cc-metric-store-source/checkpoints
|
# Download unedited checkpoint files to ./data/cc-metric-store-source/checkpoints
|
||||||
if [ ! -d data/cc-metric-store-source ]; then
|
if [ ! -d data/cc-metric-store-source ]; then
|
||||||
mkdir -p data/cc-metric-store-source/checkpoints
|
mkdir -p data/cc-metric-store-source/checkpoints
|
||||||
@ -80,6 +98,5 @@ docker-compose up -d
|
|||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo "Setup complete, containers are up by default: Shut down with 'docker-compose down'."
|
echo "Setup complete, containers are up by default: Shut down with 'docker-compose down'."
|
||||||
echo "Use './cc-backend/cc-backend' to start cc-backend."
|
echo "Use './cc-backend/cc-backend -server' to start cc-backend."
|
||||||
echo "Use scripts in /scripts to load data into influx or mariadb."
|
echo "Use scripts in /scripts to load data into influx or mariadb."
|
||||||
# ./cc-backend/cc-backend
|
|
||||||
|
@ -55,7 +55,7 @@ _munge_start() {
|
|||||||
/usr/sbin/create-munge-key -r -f
|
/usr/sbin/create-munge-key -r -f
|
||||||
sh -c "dd if=/dev/urandom bs=1 count=1024 > /etc/munge/munge.key"
|
sh -c "dd if=/dev/urandom bs=1 count=1024 > /etc/munge/munge.key"
|
||||||
chown munge: /etc/munge/munge.key
|
chown munge: /etc/munge/munge.key
|
||||||
chmod 400 /etc/munge/munge.key
|
chmod 600 /etc/munge/munge.key
|
||||||
sudo -u munge /sbin/munged
|
sudo -u munge /sbin/munged
|
||||||
munge -n
|
munge -n
|
||||||
munge -n | unmunge
|
munge -n | unmunge
|
||||||
@ -64,6 +64,10 @@ _munge_start() {
|
|||||||
|
|
||||||
# copy secrets to /.secret directory for other nodes
|
# copy secrets to /.secret directory for other nodes
|
||||||
_copy_secrets() {
|
_copy_secrets() {
|
||||||
|
while [ ! -f /home/worker/worker-secret.tar.gz ]; do
|
||||||
|
echo -n "."
|
||||||
|
sleep 1
|
||||||
|
done
|
||||||
cp /home/worker/worker-secret.tar.gz /.secret/worker-secret.tar.gz
|
cp /home/worker/worker-secret.tar.gz /.secret/worker-secret.tar.gz
|
||||||
cp /home/worker/setup-worker-ssh.sh /.secret/setup-worker-ssh.sh
|
cp /home/worker/setup-worker-ssh.sh /.secret/setup-worker-ssh.sh
|
||||||
cp /etc/munge/munge.key /.secret/munge.key
|
cp /etc/munge/munge.key /.secret/munge.key
|
||||||
|
@ -21,7 +21,7 @@ SwitchType=switch/none
|
|||||||
MpiDefault=none
|
MpiDefault=none
|
||||||
SlurmctldPidFile=/var/run/slurmd/slurmctld.pid
|
SlurmctldPidFile=/var/run/slurmd/slurmctld.pid
|
||||||
SlurmdPidFile=/var/run/slurmd/slurmd.pid
|
SlurmdPidFile=/var/run/slurmd/slurmd.pid
|
||||||
ProctrackType=proctrack/linuxproc
|
# ProctrackType=proctrack/linuxproc
|
||||||
#PluginDir=
|
#PluginDir=
|
||||||
#CacheGroups=0
|
#CacheGroups=0
|
||||||
#FirstJobId=
|
#FirstJobId=
|
||||||
@ -58,7 +58,7 @@ SchedulerType=sched/backfill
|
|||||||
#SchedulerRootFilter=
|
#SchedulerRootFilter=
|
||||||
SelectType=select/cons_res
|
SelectType=select/cons_res
|
||||||
SelectTypeParameters=CR_CPU_Memory
|
SelectTypeParameters=CR_CPU_Memory
|
||||||
FastSchedule=1
|
# FastSchedule=1
|
||||||
#PriorityType=priority/multifactor
|
#PriorityType=priority/multifactor
|
||||||
#PriorityDecayHalfLife=14-0
|
#PriorityDecayHalfLife=14-0
|
||||||
#PriorityUsageResetPeriod=14-0
|
#PriorityUsageResetPeriod=14-0
|
||||||
|
@ -68,7 +68,7 @@ _slurmdbd() {
|
|||||||
fi
|
fi
|
||||||
echo "Starting slurmdbd"
|
echo "Starting slurmdbd"
|
||||||
cp /etc/slurm/slurmdbd.conf /.secret/slurmdbd.conf
|
cp /etc/slurm/slurmdbd.conf /.secret/slurmdbd.conf
|
||||||
/usr/sbin/slurmdbd
|
/usr/sbin/slurmdbd -Dvv
|
||||||
echo "Started slurmdbd"
|
echo "Started slurmdbd"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@ SlurmUser=slurm
|
|||||||
DebugLevel=4
|
DebugLevel=4
|
||||||
#DefaultQOS=normal,standby
|
#DefaultQOS=normal,standby
|
||||||
LogFile=/var/log/slurm/slurmdbd.log
|
LogFile=/var/log/slurm/slurmdbd.log
|
||||||
PidFile=/var/run/slurmdbd/slurmdbd.pid
|
# PidFile=/var/run/slurmdbd/slurmdbd.pid
|
||||||
#PluginDir=/usr/lib/slurm
|
#PluginDir=/usr/lib/slurm
|
||||||
#PrivateData=accounts,users,usage,jobs
|
#PrivateData=accounts,users,usage,jobs
|
||||||
#TrackWCKey=yes
|
#TrackWCKey=yes
|
||||||
|
5
slurm/worker/cgroup.conf
Normal file
5
slurm/worker/cgroup.conf
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
CgroupPlugin=cgroup/v1
|
||||||
|
ConstrainCores=yes
|
||||||
|
ConstrainDevices=no
|
||||||
|
ConstrainRAMSpace=yes
|
||||||
|
ConstrainSwapSpace=yes
|
Loading…
x
Reference in New Issue
Block a user