use docker compose to launch the dev docker container (#3)

Use docker compose to run the development container.  

```
# start slurm in background
docker compose up -d

# run a terminal
docker compose exec slurm bash

# rebuild the plugin 
./rebuild.sh
```

- remove `run.sh`, `build.sh`
- adapt Readme accordingly
- I've removed the text around `docker pull ghcr.io/...`, since the `docker build` or `docker compose build` will pull the image automatically.

Author: simonpintarelli

.github/workflows/build-test-image.yml

@@ -101,11 +101,12 @@ jobs:
           EOF
       - run: |
           # verify attempting to mount under an non-existent path fails
-          su testuser -c sh <<\EOF
-          ci/tests/invalid-mount-point.sh
+          su testuser -c -m sh <<\EOF
+          ci/tests/invalid-file.sh
           EOF
       - run: |
           # --uenv-mount=.... without --uenv-mount-file must return an error
-          su testuser -c sh <<\EOF
-          srun --uenv-mount=/user-environment -v true |& grep 'srun: error: --uenv-mount'
+          su testuser -c -m sh <<\EOF
+          # this is expected to vail
+          ci/tests/invalid-flags.sh
           EOF

ci/tests/invalid-file.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+expect_error()
+{
+    (
+        set +e
+        if  ! (eval "$1") ; then
+            return 0
+        fi
+        return 1
+    )
+}
+export -f expect_error
+
+
+expect_error 'srun -n 1 --uenv-file=/home/testuser/fs.sqfs --uenv-mount=/path/does/not/exist true'

ci/tests/invalid-flags.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+expect_error()
+{
+    (
+        set +e
+        if  ! (eval "$1") ; then
+            return 0
+        fi
+        return 1
+    )
+}
+export -f expect_error
+
+
+expect_error 'srun --uenv-mount=/user-environment -v true'

ci/tests/invalid-image.sh

@@ -1,3 +1,15 @@
 #!/bin/bash
 
-srun --uenv-file=/does/not/exist true |& grep 'Invalid squashfs image' || exit 1
+expect_error()
+{
+    (
+        set +e
+        if  ! (eval "$1") ; then
+            return 0
+        fi
+        return 1
+    )
+}
+export -f expect_error
+
+expect_error 'srun --uenv-file=/does/not/exist true'

ci/tests/invalid-mount-point.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+set -x
 # pretend to run inside squasfsh-run ... bash
 export UENV_MOUNT_FILE=/home/testuser/fs.sqfs
 export UENV_MOUNT_POINT=/tmp
@@ -8,4 +9,5 @@ srun stat /tmp/test/fileA.txt
 
 # use --uenv-file to override UENV_MOUNT_FILE
 # expectation: squahfs is mounted in `/user-environment/` (default location)
+
 srun --uenv-file=/home/testuser/fs2.sqfs stat /user-environment/test/fileB.txt

ci/tests/squashfs-run.sh

@@ -14,6 +14,7 @@ RUN zypper install -y\
     unzip \
     rpm-build \
     autoconf\
+    libcap-progs \
     automake\
     libtool \
     xz-devel\

docker/Dockerfile

@@ -13,52 +13,33 @@ docker login --username=<USERNAME> ghcr.io
 ```
 When using GitHub Packages, `USERNAME` can be any text. The password is the GitHub Token.
 
-Next pull the container from GitHub Packages.
+Build the container (container name `slurm-uenv-mount`, service name `slurm`):
 ```bash
-docker pull <DOCKER_CONTAINER>
-```
-`DOCKER_CONTAINER` is the full name of the slurm container. This will typically
-be something like `ghcr.io/eth-cscs/slurm-container-SLURM_VERSION:latest`.
-For instance,
-```bash
-docker pull ghcr.io/eth-cscs/slurm-container-20.11.9:latest
+docker compose build
 ```
 
-Now build a container named `slurm-uenv-mount` that contains the Slurm server, clients, and the plugin.
-The `Dockerfile` in this directory needs to use the same `DOCKER_CONTAINER` pulled earlier.
-Either edit `Dockerfile` and replace the name of the default root container or supply the name on the commandline.
-```bash
-./build.sh [DOCKER_CONTAINER]
-```
+By default the plugin is built in a container with slurm `20.11.9`. The version
+can be changed in `docker-compose.yaml` (check
+github.com/eth-cscs/slurm-container for a list of available versions).
 
-The Dockerfile creates user `testuser` for running slurm commands as a normal user. The container itself should run
-as privileged to allow the slurm server to start.
-
-Run the container and start an interactive session as the unprivileged user `testuser`:
+Start the container in the background:
 ```bash
-docker run --name slurm-uenv-mount --rm --privileged -it slurm-uenv-mount bash
+docker compose up -d
 ```
+- The source tree is mounted read-only under `/slurm-uenv-mount`.
 
-Alternatively, `run.sh` can be used as a shortcut:
+Launch a shell in the container as unprivileged user:
 ```bash
-./run.sh bash
+docker compose exec -u testuser -w /home/testuser slurm bash
 ```
 
-`./rebuild.sh` rebuilds the plugin in the container from the local source tree (this assumes the container was started via `./run.sh`).
-
-# Rebuilding the plugin
-
-The `run.sh` script mounts the source code directory as a read-only volume inside the container under `/slurm-uenv-mount`.
-This allows the source code to be modified outside of the container, but rebuilt and tested in a slurm environment.
-To rebuild the plugin, first create a build directory in the `testuser` home inside a running container.
-Then run `make` from the build directory, specifying the Makefile from the source directory.
+Run tests:
 ```bash
-mkdir BUILD
-cd BUILD
-make -f /slurm-uenv-mount/Makefile
+docker compose exec -u testuser -w /home/testuser -T slurm bash < run-tests.sh
 ```
 
-Similarly, the source RPM can be build by specifying the `rpm` target.
+The source code is mounted read-only inside the container under `/slurm-uenv-mount`.
+When making changes in the local source tree, the plugin can be rebuilt/resintalled in the running container with the following script:
 ```bash
-make -f /slurm-uenv-mount/Makefile rpm
+./rebuild.sh
 ```

docker/Readme.md

@@ -0,0 +1,12 @@
+services:
+  slurm:
+    privileged: true
+    container_name: slurm-uenv-mount
+    volumes:
+      - ../:/slurm-uenv-mount:ro
+    build:
+      context: ../
+      args:
+        DOCKER_CONTAINER: ghcr.io/eth-cscs/slurm-container-20.11.9:latest
+      dockerfile: docker/Dockerfile
+    command: tail -F anything