Skip to content

Commit 680f64c

Browse files
committed
restored regression + updated docker compose
Signed-off-by: Surax98 <giacomo.surace@gmail.com>
1 parent fd9e9c1 commit 680f64c

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,15 @@ Just run:
4040
cd docker && docker compose up -d
4141
```
4242

43+
This way, a docker container with a full SLURM environment will be started. You can find the used SLURM configuration
44+
in /docker/SlurmConfig.yaml. If you want to update the config after you already started it once, run:
45+
46+
```bash
47+
docker compose up -d --build --force-recreate
48+
```
49+
50+
So, the old container will be deleted, the image rebuilt and a new container with the updated config will be deployed.
51+
4352
### :hammer: Building binaries
4453

4554
It is of course possible to use binaries as a standalone application. Just run

docker/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,21 @@ FROM ubuntu:22.04
1414
ENV TIMEZONE=America/New_York
1515

1616
# Run system updates
17-
RUN apt update && apt -y upgrade
17+
RUN apt-get update && apt-get -y upgrade
1818

1919
# Set time zone
2020
RUN ln -sn /usr/share/zoneinfo/${TIMEZONE} /etc/localtime \
2121
&& echo ${TIMEZONE} > /etc/timezone \
22-
&& apt -y install tzdata
22+
&& apt-get -y install tzdata
2323

2424
# Set locale
25-
RUN apt -y install locales \
25+
RUN apt-get -y install locales \
2626
&& locale-gen en_US.UTF-8 \
2727
&& update-locale LANG=en_US.UTF-8 LC_MESSAGES=POSIX
2828

2929
# Install system packages
3030
RUN DEBIAN_FRONTEND=noninteractive \
31-
apt -y install munge \
31+
apt-get -y install munge \
3232
slurm-wlm
3333

3434
# Slurm configuration
@@ -48,9 +48,9 @@ ENV SLURMCONFIGPATH=/root/SlurmConfig.yaml
4848

4949
COPY docker/SlurmConfig.yaml .
5050

51-
RUN apt update && apt install -y software-properties-common \
51+
RUN apt-get update && apt-get install -y software-properties-common \
5252
&& add-apt-repository -y ppa:apptainer/ppa \
53-
&& apt install -y apptainer
53+
&& apt-get install -y apptainer
5454

5555
RUN mkdir -p /cvmfs/grid.cern.ch/etc/grid-security
5656

pkg/slurm/aux.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,7 @@ func produceSLURMScript(
290290
commands []SingularityCommand,
291291
) (string, error) {
292292
log.G(Ctx).Info("-- Creating file for the Slurm script")
293+
prefix = ""
293294
err := os.MkdirAll(path, os.ModePerm)
294295
if err != nil {
295296
log.G(Ctx).Error(err)

0 commit comments

Comments
 (0)