From 6f66748b44a3384877c82777dc7c12be3d5fc82f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Mureau?= <gregoire.mureau+pro@etik.com>
Date: Wed, 9 Sep 2026 21:10:08 +0200
Subject: [PATCH] Ajouter le CD P8 : build/push vers le registry OCI Forgejo.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Même schéma que P7 (login PAT write:package, builder classique, pas de cut-over k3s).
---
 .github/workflows/cd.yml | 63 ++++++++++++++++++++++++++++++++++++++++
 .github/workflows/ci.yml |  2 +-
 2 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/cd.yml

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
new file mode 100644
index 0000000..44184b7
--- /dev/null
+++ b/.github/workflows/cd.yml
@@ -0,0 +1,63 @@
+# CD — build/push image vers le registry OCI Forgejo (OC-ADR-006).
+# Job uniquement sur git.gregoiremureau.com. DinD 8 Gio. Push via Tailscale
+# (extra_host jobs → NAS), pas Cloudflare (limite body 100 Mo).
+
+name: CD
+
+on:
+  push:
+    branches: [main]
+    paths:
+      - "Dockerfile"
+      - "app/**"
+      - "utils/**"
+      - "start.sh"
+      - "nginx.conf"
+      - "cityscapes_config.json"
+      - ".github/workflows/cd.yml"
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  packages: write
+
+jobs:
+  build-and-push:
+    if: contains(github.server_url, 'gregoiremureau.com')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Docker CLI (client only) + daemon DinD
+        run: |
+          set -eu
+          apt-get update
+          apt-get install -y --no-install-recommends ca-certificates curl
+          curl -fsSL https://download.docker.com/linux/static/stable/x86_64/docker-27.5.1.tgz \
+            | tar -xz -C /tmp
+          install /tmp/docker/docker /usr/local/bin/docker
+          docker version
+          docker info
+
+      - name: Login registry Forgejo
+        run: |
+          set -eu
+          REGISTRY="${GITHUB_SERVER_URL#https://}"
+          echo "${{ secrets.PACKAGE_TOKEN }}" | docker login "${REGISTRY}" -u "${GITHUB_ACTOR}" --password-stdin
+
+      - name: Build and push
+        run: |
+          set -eu
+          REGISTRY="${GITHUB_SERVER_URL#https://}"
+          IMAGE="${REGISTRY}/grgmro/oc-p08-street-vision"
+          SHORT_SHA="$(echo "${GITHUB_SHA}" | cut -c1-12)"
+          export DOCKER_BUILDKIT=0
+          docker build \
+            -t "${IMAGE}:${SHORT_SHA}" \
+            -t "${IMAGE}:latest" \
+            -f Dockerfile \
+            .
+          docker push "${IMAGE}:${SHORT_SHA}"
+          docker push "${IMAGE}:latest"
+          echo "pushed ${IMAGE}:${SHORT_SHA} and :latest"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0b7f1cc..fe71be9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,6 +1,6 @@
 # CI légère — P8 Street Vision
 # Même fichier lu par Forgejo Actions et GitHub Actions (OC-ADR-001).
-# Le build Docker (SegFormer / TF) est Phase 6 : trop lourd pour le runner k3s (8 Gio).
+# Le build Docker est `.github/workflows/cd.yml` (registry Forgejo, pas de cut-over k3s).
 
 name: CI