Removed hyphens from Docker Compose YAML file

This commit is contained in:
Bole Ma 2024-02-26 20:32:08 +01:00
parent 5dcd3ca647
commit 72b6a2f0cc
3 changed files with 16 additions and 16 deletions

View File

@ -1,8 +1,8 @@
FROM rockylinux:9
LABEL org.opencontainers.image.source="https://github.com/ClusterCockpit/cc-docker/" \
org.opencontainers.image.title="slurm-docker-cluster" \
org.opencontainers.image.description="Slurm Docker cluster on Rocky Linux 9" \
org.opencontainers.image.title="cc-docker" \
org.opencontainers.image.description="Docker Slurm ClusterCockpit on Rocky Linux 9" \
org.label-schema.docker.cmd="docker-compose up -d" \
maintainer="Bole Ma, Giovanni Torres"
@ -58,7 +58,7 @@ RUN set -ex \
WORKDIR /home
RUN set -x \
&& git clone https://gitlab.hrz.tu-chemnitz.de/pika/pika-packages.git \
&& git clone https://github.com/ClusterCockpit/cc-slurmPrEpPlugin \
&& git clone https://github.com/nats-io/nats.c.git \
&& git clone -b ${SLURM_TAG} --single-branch --depth=1 https://github.com/SchedMD/slurm.git \
&& pushd slurm \

View File

@ -27,20 +27,20 @@ The compose file will create the following named volumes:
Build the image locally:
```console
docker build -t slurm-docker-cluster:21.08.6 .
docker build -t slurm-docker-cluster:22.05.2 .
```
Build a different version of Slurm using Docker build args and the Slurm Git
tag:
```console
docker build --build-arg SLURM_TAG="slurm-19-05-2-1" -t slurm-docker-cluster:19.05.2 .
docker build --build-arg SLURM_TAG="slurm-22-05-2-1" -t slurm-docker-cluster:22.05.2 .
```
Or equivalently using `docker-compose`:
```console
SLURM_TAG=slurm-19-05-2-1 IMAGE_TAG=19.05.2 docker-compose build
SLURM_TAG=slurm-22-05-2-1 IMAGE_TAG=22.05.2 docker compose build
```
@ -49,7 +49,7 @@ SLURM_TAG=slurm-19-05-2-1 IMAGE_TAG=19.05.2 docker-compose build
Run `docker-compose` to instantiate the cluster:
```console
IMAGE_TAG=19.05.2 docker-compose up -d
IMAGE_TAG=22.05.2 docker compose up -d
```
## Register the Cluster with SlurmDBD
@ -101,8 +101,8 @@ slurm-2.out
## Stopping and Restarting the Cluster
```console
docker-compose stop
docker-compose start
docker compose stop
docker compose start
```
## Deleting the Cluster
@ -110,7 +110,7 @@ docker-compose start
To remove all containers and volumes, run:
```console
docker-compose stop
docker-compose rm -f
docker compose stop
docker compose rm -f
docker volume rm slurm-docker-cluster_etc_munge slurm-docker-cluster_etc_slurm slurm-docker-cluster_slurm_jobdir slurm-docker-cluster_var_lib_mysql slurm-docker-cluster_var_log_slurm
```

View File

@ -14,11 +14,11 @@ services:
- var_lib_mysql:/var/lib/mysql
slurmdbd:
image: slurm-docker-cluster:${IMAGE_TAG:-22.05}
image: cc-docker:${IMAGE_TAG:-22.05}
build:
context: .
args:
SLURM_TAG: ${SLURM_TAG:-slurm-22-05-2-1}
SLURM_TAG: ${SLURM_TAG:slurm-22-05-2-1}
command: ["slurmdbd"]
container_name: slurmdbd
hostname: slurmdbd
@ -32,7 +32,7 @@ services:
- mysql
slurmctld:
image: slurm-docker-cluster:${IMAGE_TAG:-22.05}
image: cc-docker:${IMAGE_TAG:22.05}
command: ["slurmctld"]
container_name: slurmctld
hostname: slurmctld
@ -47,7 +47,7 @@ services:
- "slurmdbd"
c1:
image: slurm-docker-cluster:${IMAGE_TAG:-22.05}
image: cc-docker:${IMAGE_TAG:22.05}
command: ["slurmd"]
hostname: c1
container_name: c1
@ -62,7 +62,7 @@ services:
- "slurmctld"
c2:
image: slurm-docker-cluster:${IMAGE_TAG:-22.05}
image: cc-docker:${IMAGE_TAG:22.05}
command: ["slurmd"]
hostname: c2
container_name: c2