fix: various optimizations (#82)

Author: giovtorres

.dockerignore

@@ -0,0 +1,41 @@
+# Git files
+.git/
+.github/
+.gitignore
+.gitattributes
+
+# Python virtual environments and caches
+venv/
+.mypy_cache/
+__pycache__/
+*.pyc
+*.pyo
+*.pyd
+
+# Development
+*.log
+
+# Documentation and README files
+*.md
+readme/
+
+# Build and development scripts
+Makefile
+test_cluster.sh
+run_examples.sh
+update_slurmfiles.sh
+
+# Environment files (these should be set at build time via --build-arg)
+.env
+.env.example
+
+# IDE and editor files
+.vscode/
+.idea/
+*.swp
+*.swo
+*~
+
+# OS files
+.DS_Store
+Thumbs.db

Dockerfile

@@ -16,7 +16,6 @@ ARG TARGETARCH
 # Install RPM build tools and dependencies
 RUN set -ex \
     && dnf makecache \
-    && dnf -y update \
     && dnf -y install dnf-plugins-core epel-release \
     && dnf config-manager --set-enabled crb \
     && dnf makecache \
@@ -92,17 +91,14 @@ LABEL org.opencontainers.image.source="https://github.com/giovtorres/slurm-docke
 ARG SLURM_VERSION
 ARG TARGETARCH
 
-# Enable CRB and EPEL repositories for runtime dependencies
+# Enable CRB and EPEL repositories, then install runtime dependencies
 RUN set -ex \
-    && dnf makecache \
     && dnf -y update \
     && dnf -y install dnf-plugins-core epel-release \
     && dnf config-manager --set-enabled crb \
-    && dnf makecache
-
-# Install runtime dependencies only
-RUN set -ex \
+    && dnf makecache \
     && dnf -y install \
+       apptainer \
        bash-completion \
        bzip2 \
        gettext \
@@ -132,16 +128,21 @@ RUN set -ex \
 
 # Install gosu for privilege dropping
 ARG GOSU_VERSION=1.19
+# Official SHA256 checksums from https://github.com/tianon/gosu/releases/download/1.19/SHA256SUMS
+ARG GOSU_SHA256_AMD64=52c8749d0142edd234e9d6bd5237dff2d81e71f43537e2f4f66f75dd4b243dd0
+ARG GOSU_SHA256_ARM64=3a8ef022d82c0bc4a98bcb144e77da714c25fcfa64dccc57f6aba7ae47ff1a44
 
 RUN set -ex \
-    && echo "Installing gosu for architecture: ${TARGETARCH}" \
-    && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-${TARGETARCH}" \
-    && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-${TARGETARCH}.asc" \
-    && export GNUPGHOME="$(mktemp -d)" \
-    && gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
-    && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
-    && rm -rf "${GNUPGHOME}" /usr/local/bin/gosu.asc \
+    && echo "Installing gosu ${GOSU_VERSION} for architecture: ${TARGETARCH}" \
+    && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}" \
+    && EXPECTED_SHA256=$(case "${TARGETARCH}" in \
+         amd64) echo "${GOSU_SHA256_AMD64}" ;; \
+         arm64) echo "${GOSU_SHA256_ARM64}" ;; \
+         *) echo "Unsupported architecture: ${TARGETARCH}" && exit 1 ;; \
+       esac) \
+    && echo "${EXPECTED_SHA256}  /usr/local/bin/gosu" | sha256sum -c - \
     && chmod +x /usr/local/bin/gosu \
+    && gosu --version \
     && gosu nobody true
 
 COPY --from=builder /root/rpmbuild/RPMS/*/*.rpm /tmp/rpms/
@@ -158,27 +159,14 @@ RUN set -ex \
     && rm -rf /tmp/rpms \
     && dnf clean all
 
-# Install Singularity
-RUN set -ex \
-    && dnf -y install \
-       apptainer \
-    && dnf clean all \
-    && rm -rf /var/cache/dnf
-
-# Create slurm user and group
+# Create users, generate munge key, and set up directories
 RUN set -x \
     && groupadd -r --gid=990 slurm \
     && useradd -r -g slurm --uid=990 slurm \
     && groupadd -r --gid=991 slurmrest \
-    && useradd -r -g slurmrest --uid=991 slurmrest
-
-# Fix /etc permissions and create munge key
-RUN set -x \
+    && useradd -r -g slurmrest --uid=991 slurmrest \
     && chmod 0755 /etc \
-    && /sbin/create-munge-key
-
-# Create slurm dirs with correct ownership
-RUN set -x \
+    && /sbin/create-munge-key \
     && mkdir -m 0755 -p \
         /var/run/slurm \
         /var/spool/slurm \

Makefile

@@ -1,4 +1,4 @@
-.PHONY: help build up start down clean logs test status shell logs-slurmctld logs-slurmdbd update-slurm reload-slurm version set-version build-all test-all test-version
+.PHONY: help build build-no-cache up start down clean logs test status shell logs-slurmctld logs-slurmdbd update-slurm reload-slurm version set-version build-all test-all test-version
 
 # Default target
 .DEFAULT_GOAL := help
@@ -17,6 +17,7 @@ help:  ## Show this help message
 	@echo ""
 	@echo "Cluster Management:"
 	@printf "  ${CYAN}%-15s${RESET} %s\n" "build" "Build Docker images"
+	@printf "  ${CYAN}%-15s${RESET} %s\n" "build-no-cache" "Build Docker images without cache"
 	@printf "  ${CYAN}%-15s${RESET} %s\n" "up" "Start containers"
 	@printf "  ${CYAN}%-15s${RESET} %s\n" "down" "Stop containers"
 	@printf "  ${CYAN}%-15s${RESET} %s\n" "clean" "Remove containers and volumes"
@@ -54,6 +55,9 @@ help:  ## Show this help message
 build:  ## Build Docker images
 	docker compose --progress plain build
 
+build-no-cache:  ## Build Docker images without cache
+	docker compose --progress plain build --no-cache
+
 up:  ## Start containers
 	docker compose up -d
 

README.md

@@ -23,7 +23,7 @@ git clone https://github.com/giovtorres/slurm-docker-cluster.git
 cd slurm-docker-cluster
 ```
 
-## 🔢 Choosing Your Slurm Version
+### 🔢 Choosing Your Slurm Version
 
 This project supports multiple Slurm versions. To select your version, copy `.env.example` to `.env` and set `SLURM_VERSION`:
 
@@ -37,33 +37,27 @@ SLURM_VERSION=24.11.6   # Previous stable release
 
 **Supported versions:** 25.05.x, 24.11.x
 
-## 🏗️ Architecture Support
+### 🏗️ Architecture Support
 
 This project supports both **AMD64 (x86_64)** and **ARM64 (aarch64)**
 architectures. The build system automatically detects your architecture. No
-special configuration is needed - simply build and run:
+special configuration is needed - simply build and run.
+
+## Build and start the cluster
 
 ```bash
 make build
 make up
 ```
 
-## 🚀 Quick Start (Using Make)
-
-The easiest way to get started is using the provided Makefile:
+### View cluster status
 
 ```bash
-# Build and start the cluster
-make up
-
-# Run tests to verify everything works
-make test
-
-# View cluster status
 make status
 ```
 
 See all available commands:
+
 ```bash
 make help
 ```