Merge pull request #1495 from fractal-analytics-platform/docker-images

Review Docker images
fractal-analytics-platform · May 15, 2024 · c004c74 · c004c74
2 parents fee3d99 + 0cb12f3
commit c004c74
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 # Unreleased
 
+* Testing:
+    * Improve dockerfiles for SLURM (\#1495).
+
 # 2.0.6
 
 > NOTE: This version changes log formats.

diff --git a/tests/data/slurm_docker_images/docker-compose-private.yml b/tests/data/slurm_docker_images/docker-compose-private.yml
@@ -2,8 +2,6 @@
 # The only difference is '/private:/private:rw' in place of '/tmp:/tmp:rw'
 # See https://github.com/fractal-analytics-platform/fractal-server/issues/1475
 
-version: '3'
-
 services:
 
   slurm-docker-master:

diff --git a/tests/data/slurm_docker_images/docker-compose.yml b/tests/data/slurm_docker_images/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
 
   slurm-docker-master:

diff --git a/tests/data/slurm_docker_images/master/Dockerfile b/tests/data/slurm_docker_images/master/Dockerfile
@@ -1,8 +1,5 @@
 FROM rancavil/slurm-master:19.05.5-1
 
-RUN apt-get update
-RUN sudo apt-get install python3-venv -y
-
 COPY slurm.conf /etc/slurm-llnl/
 ADD sudoers /etc/sudoers
 

diff --git a/tests/data/slurm_docker_images/node/Dockerfile b/tests/data/slurm_docker_images/node/Dockerfile
@@ -9,9 +9,8 @@ COPY slurm.conf /etc/slurm-llnl/
 ADD fractal_server_local.tar.gz .
 WORKDIR ./fractal-server
 
-RUN pip3 install --upgrade pip setuptools wheel
+RUN pip3 install --upgrade pip setuptools wheel devtools
 RUN pip3 install -e .
-RUN pip3 install devtools
 
 RUN useradd --uid 2001 -m test01 -s /usr/bin/bash -d /home/test01 && echo "test01:test01" | chpasswd