fix: stabilize Docker builds by standardizing on ARM64 and explicit stage naming (klz-2026 pattern)

.dockerignore

@@ -0,0 +1,12 @@
+node_modules
+.next
+.git
+.npmrc
+dist
+build
+out
+coverage
+.vercel
+.turbo
+*.log
+.DS_Store

.gitea/workflows/pipeline.yml

@@ -28,7 +28,6 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node_version: 20
-          cache: 'pnpm'
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
@@ -69,7 +68,6 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node_version: 20
-          cache: 'pnpm'
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
@@ -106,8 +104,11 @@ jobs:
         with:
           context: .
           file: packages/infra/docker/Dockerfile.nextjs
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/arm64
+          pull: true
           push: true
+          secrets: |
+            NPM_TOKEN=${{ secrets.NPM_TOKEN }}
           tags: |
             registry.infra.mintel.me/mintel/nextjs:${{ github.ref_name }}
             registry.infra.mintel.me/mintel/nextjs:latest
@@ -117,8 +118,11 @@ jobs:
         with:
           context: .
           file: packages/infra/docker/Dockerfile.runtime
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/arm64
+          pull: true
           push: true
+          secrets: |
+            NPM_TOKEN=${{ secrets.NPM_TOKEN }}
           tags: |
             registry.infra.mintel.me/mintel/runtime:${{ github.ref_name }}
             registry.infra.mintel.me/mintel/runtime:latest
@@ -128,8 +132,11 @@ jobs:
         with:
           context: .
           file: packages/infra/docker/Dockerfile.gatekeeper
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/arm64
+          pull: true
           push: true
+          secrets: |
+            NPM_TOKEN=${{ secrets.NPM_TOKEN }}
           tags: |
             registry.infra.mintel.me/mintel/gatekeeper:${{ github.ref_name }}
             registry.infra.mintel.me/mintel/gatekeeper:latest
@@ -139,8 +146,11 @@ jobs:
         with:
           context: .
           file: packages/infra/docker/Dockerfile.directus
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/arm64
+          pull: true
           push: true
+          secrets: |
+            NPM_TOKEN=${{ secrets.NPM_TOKEN }}
           tags: |
             registry.infra.mintel.me/mintel/directus:${{ github.ref_name }}
             registry.infra.mintel.me/mintel/directus:latest

packages/infra/docker/Dockerfile.gatekeeper

@@ -1,30 +1,24 @@
-FROM node:20-alpine AS base
-
+# Step 1: Builder stage
+FROM node:20-alpine AS builder
 RUN apk add --no-cache libc6-compat curl
 WORKDIR /app
-
-# Enable pnpm
 RUN corepack enable pnpm
 
-# Install dependencies (using monorepo root context)
-COPY pnpm-lock.yaml pnpm-workspace.yaml package.json .npmrc* ./
-COPY packages/gatekeeper/package.json ./packages/gatekeeper/
-COPY packages/next-utils/package.json ./packages/next-utils/
-COPY packages/tsconfig/package.json ./packages/tsconfig/
-COPY packages/eslint-config/package.json ./packages/eslint-config/
-COPY packages/next-config/package.json ./packages/next-config/
-
-RUN --mount=type=cache,target=/root/.local/share/pnpm/store/v3 \
-    pnpm i --frozen-lockfile
-
-# Copy source
+# Copy source (honoring .dockerignore)
 COPY . .
 
+# Use a secret for NPM_TOKEN to authenticate with private registry
+RUN --mount=type=cache,target=/root/.local/share/pnpm/store/v3 \
+    --mount=type=secret,id=NPM_TOKEN \
+    export NPM_TOKEN=$(cat /run/secrets/NPM_TOKEN) && \
+    pnpm i --frozen-lockfile
+
 # Build Gatekeeper
 RUN pnpm --filter @mintel/gatekeeper build
 
-# Runner
-FROM base AS runner
+# Step 2: Runner stage
+FROM node:20-alpine AS runner
+RUN apk add --no-cache libc6-compat curl
 WORKDIR /app
 ENV NODE_ENV=production
 RUN addgroup --system --gid 1001 nodejs

packages/infra/docker/Dockerfile.nextjs

@@ -1,24 +1,19 @@
-FROM node:20-alpine AS base
-
+# Step 1: Builder image
+FROM node:20-alpine AS builder
 RUN apk add --no-cache libc6-compat curl
 WORKDIR /app
-
-# Enable pnpm
 RUN corepack enable pnpm
 
-# Copy root configurations
-COPY pnpm-lock.yaml pnpm-workspace.yaml package.json .npmrc* ./
-
-# Copy all package.json files to allow pnpm install to be cached
-COPY packages/*/package.json ./packages/
-COPY apps/*/package.json ./apps/
-
-# Install dependencies for the entire monorepo
-RUN --mount=type=cache,target=/root/.local/share/pnpm/store/v3 \
-    pnpm i --frozen-lockfile
-
-# Copy the rest of the source code
+# Step 2: Install dependencies
+# We copy everything first because we have a .dockerignore
+# and we need the workspace structure for pnpm to work correctly
 COPY . .
 
-# Post-install/Build shared packages if needed
-RUN pnpm -r build --filter="./packages/*"
+# Use a secret for NPM_TOKEN to authenticate with private registry
+RUN --mount=type=cache,target=/root/.local/share/pnpm/store/v3 \
+    --mount=type=secret,id=NPM_TOKEN \
+    export NPM_TOKEN=$(cat /run/secrets/NPM_TOKEN) && \
+    pnpm i --frozen-lockfile
+
+# Step 3: Build shared packages
+RUN pnpm --filter "./packages/*" -r build

packages/infra/gitea/deploy-action.yml

@@ -148,7 +148,6 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 20
-          cache: 'npm'
 
       - name: Install dependencies
         run: npm ci
@@ -195,11 +194,15 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
+          file: packages/infra/docker/Dockerfile.nextjs
           platforms: linux/arm64
+          pull: true
           build-args: |
             NEXT_PUBLIC_BASE_URL=${{ needs.prepare.outputs.next_public_base_url }}
             NEXT_PUBLIC_TARGET=${{ needs.prepare.outputs.target }}
           push: true
+          secrets: |
+            NPM_TOKEN=${{ secrets.NPM_TOKEN }}
           tags: registry.infra.mintel.me/mintel/${{ github.event.repository.name }}:${{ needs.prepare.outputs.image_tag }}
           cache-from: type=registry,ref=registry.infra.mintel.me/mintel/${{ github.event.repository.name }}:buildcache
           cache-to: type=registry,ref=registry.infra.mintel.me/mintel/${{ github.event.repository.name }}:buildcache,mode=max

packages/infra/scripts/prune-registry.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+set -e
+
+# Configuration
+REGISTRY_DATA="/opt/infra/registry/data/docker/registry/v2"
+KEEP_TAGS=5
+
+echo "🏥 Starting Registry & Docker Maintenance..."
+
+# 1. Prune Registry Tags (Filesystem level)
+# This identifies main-* tags and keeps only the latest N
+for repo_dir in "$REGISTRY_DATA/repositories/mintel/"*; do
+    repo_name=$(basename "$repo_dir")
+    tags_dir="$repo_dir/_manifests/tags"
+    
+    if [ -d "$tags_dir" ]; then
+        echo "🔍 Processing repository: mintel/$repo_name"
+        
+        # Get main-* tags sorted by modification time (newest first)
+        main_tags=$(ls -dt "$tags_dir"/main-* 2>/dev/null || true)
+        
+        count=0
+        for tag_path in $main_tags; do
+            ((++count))
+            if [ $count -gt $KEEP_TAGS ]; then
+                echo "  🗑️ Deleting old tag: $(basename "$tag_path")"
+                rm -rf "$tag_path"
+            fi
+        done
+    fi
+done
+
+# 2. Run Garbage Collection
+echo "♻️ Running Registry Garbage Collection..."
+docker exec registry-registry-1 bin/registry garbage-collect /etc/docker/registry/config.yml
+
+# 3. Prune Host Docker resources
+echo "🧹 Pruning Host Docker resources..."
+# Separate prune commands because --filter and --volumes can be incompatible on some versions
+docker system prune -af --filter "until=168h"
+docker volume prune -f
+
+echo "✅ Maintenance complete!"
+df -h /