fix: Update Dockerfile templates to use --no-install-recommends for package installations

Author: prudhomm

.github/workflows/feelpp-env.yml

@@ -59,7 +59,7 @@ jobs:
           - {service: feelpp-env, dist: testing,  flavor: debian, version: "testing", tag: debian-testing, experimental: true,  platforms: "linux/amd64",              dockerfile: Dockerfile}
           - {service: feelpp-env, dist: sid,      flavor: debian, version: "sid",     tag: debian-sid,     experimental: true,  platforms: "linux/amd64,linux/arm64", dockerfile: Dockerfile}
           - {service: feelpp-env, dist: noble,    flavor: ubuntu, version: "24.04",   tag: ubuntu-24.04,   experimental: false, platforms: "linux/amd64,linux/arm64", dockerfile: Dockerfile}
-          - {service: feelpp-env, dist: oracular, flavor: ubuntu, version: "26.04",   tag: ubuntu-26.04,   experimental: true,  platforms: "linux/amd64,linux/arm64", dockerfile: Dockerfile}
+          # ubuntu-26.04 disabled: resolute repositories not yet available on mirrors
           - {service: feelpp-env, dist: fedora-42, flavor: fedora, version: "42",     tag: fedora-42,      experimental: false, platforms: "linux/amd64",              dockerfile: Dockerfile}
     runs-on: self-docker
     needs: activate
@@ -76,25 +76,16 @@ jobs:
         enable-cache: true
     - name: Setup Python factory
       run: |
-          if [ -f "feelpp-env/factory.sh" ]; then
-            echo "Setting up Python factory environment..."
-            cd feelpp-env
-            uv venv .venv
-            source .venv/bin/activate
-            uv pip install -q pyyaml jinja2 click rich pydantic
-            ./factory.sh validate || echo "Validation skipped"
-          fi
+          echo "Setting up Python factory environment..."
+          cd feelpp-env
+          uv venv .venv
+          source .venv/bin/activate
+          uv pip install -q pyyaml jinja2 click rich pydantic
+          ./factory.sh validate
     - name: generate
       run: |
-          # Try Python factory first, fallback to bash script
-          if [ -x "./factory.sh" ] && [ -d "config" ]; then
-            echo "Using Python factory..."
-            ./factory.sh generate --dist ${{ matrix.flavor }}:${{ matrix.version }}
-            dir="${{ matrix.flavor }}-${{ matrix.version }}-clang++"
-          else
-            echo "Using bash mkimg.sh..."
-            dir="$(bash mkimg.sh -f ${{ matrix.flavor }}:${{ matrix.version }} -t feelpp/${{ matrix.service }}:${{ matrix.tag }})"
-          fi
+          ./factory.sh generate --dist ${{ matrix.flavor }}:${{ matrix.version }}
+          dir="${{ matrix.flavor }}-${{ matrix.version }}-clang++"
           echo "context=feelpp-env/${dir}" >> "$GITHUB_OUTPUT"
           ls -lrt
       id: generate
@@ -143,25 +134,16 @@ jobs:
         enable-cache: true
     - name: Setup Python factory
       run: |
-          if [ -f "feelpp-env/factory.sh" ]; then
-            echo "Setting up Python factory environment..."
-            cd feelpp-env
-            uv venv .venv
-            source .venv/bin/activate
-            uv pip install -q pyyaml jinja2 click rich pydantic
-            ./factory.sh validate || echo "Validation skipped"
-          fi
+          echo "Setting up Python factory environment..."
+          cd feelpp-env
+          uv venv .venv
+          source .venv/bin/activate
+          uv pip install -q pyyaml jinja2 click rich pydantic
+          ./factory.sh validate
     - name: generate
       run: |
-          # Try Python factory first, fallback to bash script
-          if [ -x "./factory.sh" ] && [ -d "config" ]; then
-            echo "Using Python factory..."
-            ./factory.sh generate --dist ${{ inputs.flavor }}:${{ inputs.version }}
-            dir="${{ inputs.flavor }}-${{ inputs.version }}-clang++"
-          else
-            echo "Using bash mkimg.sh..."
-            dir="$(bash mkimg.sh -f ${{ inputs.flavor }}:${{ inputs.version }} -t feelpp/${{ env.service }}:${{ env.tag }})"
-          fi
+          ./factory.sh generate --dist ${{ inputs.flavor }}:${{ inputs.version }}
+          dir="${{ inputs.flavor }}-${{ inputs.version }}-clang++"
           echo "context=feelpp-env/${dir}" >> "$GITHUB_OUTPUT"
           ls -lrt
       id: generate

feelpp-env/config/distributions.yaml

@@ -2,7 +2,7 @@ distributions:
   debian:
     package_manager: apt
     template: debian.dockerfile.j2
-    mirror: ftp.fr.debian.org
+    mirror: miroir.univ-lorraine.fr
     versions:
       - name: trixie
         tag: "13"

feelpp-env/config/variants.yaml

@@ -14,7 +14,7 @@ variants:
       - debian:testing
       - debian:sid
       - ubuntu:24.04
-      - ubuntu:26.04
+      # - ubuntu:26.04  # Disabled: resolute repositories not yet available on mirrors
       - fedora:42
     extra_packages:
       apt: []

feelpp-env/factory/cli.py

@@ -2,6 +2,7 @@
 """Command-line interface for Feel++ Docker factory."""
 
 import sys
+import subprocess
 from pathlib import Path
 from typing import Optional
 
@@ -219,6 +220,118 @@ def matrix(ctx, variant: str, format: str):
         sys.exit(1)
 
 
+@main.command()
+@click.argument('dist', required=True)
+@click.option('--variant', default='feelpp-env', help='Variant to build')
+@click.option('--tag', help='Docker tag (default: feelpp-env:DIST-VERSION)')
+@click.option('--platform', help='Platform to build for (e.g., linux/amd64)')
+@click.option('--no-cache', is_flag=True, help='Build without using cache')
+@click.option('--output-dir', type=click.Path(path_type=Path), 
+              default=Path.cwd(),
+              help='Directory containing generated Dockerfiles')
+@click.pass_context
+def build(ctx, dist: str, variant: str, tag: Optional[str], 
+         platform: Optional[str], no_cache: bool, output_dir: Path):
+    """Build Docker image locally for testing.
+    
+    DIST should be in format 'name:version' (e.g., ubuntu:24.04, debian:13)
+    
+    Examples:
+    
+        # Build Ubuntu 24.04 image
+        ./factory.sh build ubuntu:24.04
+        
+        # Build with custom tag
+        ./factory.sh build debian:13 --tag test:debian-13
+        
+        # Build for specific platform
+        ./factory.sh build ubuntu:24.04 --platform linux/amd64
+        
+        # Build without cache
+        ./factory.sh build fedora:42 --no-cache
+    """
+    config: Config = ctx.obj['config']
+    builder: ImageBuilder = ctx.obj['builder']
+    
+    if variant not in config.variants:
+        console.print(f"[red]Error:[/red] Unknown variant '{variant}'")
+        console.print(f"Available variants: {', '.join(config.variants.keys())}")
+        sys.exit(1)
+    
+    try:
+        dist_name, version_tag = dist.split(':')
+    except ValueError:
+        console.print(f"[red]Error:[/red] DIST must be in format 'name:version' (got '{dist}')")
+        console.print("Examples: ubuntu:24.04, debian:13, fedora:42")
+        sys.exit(1)
+    
+    # Check if Dockerfile exists, generate if not
+    dockerfile_dir = output_dir / f"{dist_name}-{version_tag}-clang++"
+    dockerfile_path = dockerfile_dir / "Dockerfile"
+    
+    if not dockerfile_path.exists():
+        console.print(f"[yellow]Dockerfile not found, generating...[/yellow]")
+        try:
+            builder.generate_dockerfile(variant, dist_name, version_tag, dockerfile_dir)
+            console.print(f"[green]✓[/green] Generated {dockerfile_path}")
+        except Exception as e:
+            console.print(f"[red]Error generating Dockerfile:[/red] {e}")
+            sys.exit(1)
+    
+    # Prepare Docker build command
+    if not tag:
+        tag = f"feelpp-env:{dist_name}-{version_tag}"
+    
+    build_cmd = [
+        "docker", "build",
+        "-t", tag,
+        "-f", str(dockerfile_path),
+    ]
+    
+    if platform:
+        build_cmd.extend(["--platform", platform])
+    
+    if no_cache:
+        build_cmd.append("--no-cache")
+    
+    # Context is the directory containing the Dockerfile
+    build_cmd.append(str(dockerfile_dir))
+    
+    console.print(f"\n[blue]Building Docker image:[/blue]")
+    console.print(f"  Distribution: {dist}")
+    console.print(f"  Tag: {tag}")
+    console.print(f"  Dockerfile: {dockerfile_path}")
+    if platform:
+        console.print(f"  Platform: {platform}")
+    console.print()
+    
+    # Show the command
+    console.print(f"[dim]$ {' '.join(build_cmd)}[/dim]\n")
+    
+    # Run Docker build
+    try:
+        result = subprocess.run(
+            build_cmd,
+            check=False,
+            cwd=dockerfile_dir.parent
+        )
+        
+        if result.returncode == 0:
+            console.print(f"\n[green]✓ Successfully built {tag}[/green]")
+            console.print(f"\nTo run the image:")
+            console.print(f"  docker run -it --rm {tag}")
+        else:
+            console.print(f"\n[red]✗ Build failed with exit code {result.returncode}[/red]")
+            sys.exit(result.returncode)
+            
+    except FileNotFoundError:
+        console.print("[red]Error:[/red] Docker command not found. Is Docker installed?")
+        sys.exit(1)
+    except KeyboardInterrupt:
+        console.print("\n[yellow]Build interrupted by user[/yellow]")
+        sys.exit(130)
+
+
 @main.command()
 @click.option('--variant', default='feelpp-env', help='Variant to update CI for')
 @click.option('--workflow-file', type=click.Path(path_type=Path),

feelpp-env/templates/debian.dockerfile.j2

@@ -21,18 +21,18 @@ RUN set -e; \
 
 # Install core dependencies
 RUN apt-get -qq update && \
-    apt-get -y install \
+    apt-get -y install --no-install-recommends \
     gnupg \
     ca-certificates-java default-jre-headless
 
 # Set timezone
 ARG DEBIAN_FRONTEND=noninteractive
 ENV TZ=Europe/Paris
-RUN apt-get -y install tzdata
+RUN apt-get -y install --no-install-recommends tzdata
 
 # Install all packages
 RUN apt-get -qq update && \
-    apt-get -y install \
+    apt-get -y install --no-install-recommends \
 {{ packages | join_packages(8) }}
     && apt-get autoremove \
     && apt-get clean \
@@ -41,7 +41,7 @@ RUN apt-get -qq update && \
 {% if enable_openmpi and requires_openmpi_layer %}
 # Install OpenMPI
 RUN apt-get -qq update && \
-    apt-get -y install \
+    apt-get -y install --no-install-recommends \
         libopenmpi-dev \
         openmpi-bin \
     && apt-get autoremove \

feelpp-env/templates/ubuntu.dockerfile.j2

@@ -11,14 +11,14 @@ RUN sed -i 's/http:\/\/archive.ubuntu.com\/ubuntu\//http:\/\/miroir.univ-lorrain
 ARG DEBIAN_FRONTEND=noninteractive
 ENV TZ=Europe/Paris
 RUN apt-get -qq update && \
-    apt-get -y --force-yes install tzdata software-properties-common \
+    apt-get -y --force-yes install --no-install-recommends tzdata software-properties-common \
     && apt-get -y autoremove \
     && apt-get -y clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Install all packages
 RUN apt-get -qq update && \
-    apt-get -yq install \
+    apt-get -y install --no-install-recommends \
 {{ packages | join_packages(8) }}
     && apt-get -y autoremove \
     && apt-get -y clean \
@@ -27,7 +27,7 @@ RUN apt-get -qq update && \
 {% if enable_openmpi and requires_openmpi_layer %}
 # Install OpenMPI
 RUN apt-get -qq update && \
-    apt-get -yq install \
+    apt-get -y install --no-install-recommends \
         libopenmpi-dev \
         openmpi-bin \
     && apt-get -y autoremove \