From 6b6f43bca94331c0bc23d5d79abeec9dca8a8126 Mon Sep 17 00:00:00 2001 From: m Date: Mon, 21 Sep 2026 20:13:15 +0200 Subject: [PATCH] fix ci: docker via socket hote (plus de dind), tags sha/latest, caches go/gradle, release apk durcie --- .gitea/workflows/ci.yml | 72 +++++++++++++++++------------------- .gitea/workflows/release.yml | 69 +++++++++++++++++----------------- 2 files changed, 66 insertions(+), 75 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 2dabb84..5899d7b 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -2,9 +2,11 @@ # # Prérequis act_runner (une seule fois) : # - Runner act_runner enregistré contre l'instance Gitea, labels `ubuntu-24.04` dispo. -# - Job `docker` : le service `docker:27-dind` est lancé avec -# `options: --privileged` (obligatoire pour DinD) et `DOCKER_TLS_CERTDIR: ""` -# (sinon l'image écoute en TLS sur 2376 et non en clair sur 2375). +# - Job `docker` : utilise le daemon Docker de l'hôte du runner via le +# socket monté (`-v /var/run/docker.sock:/var/run/docker.sock`, pas de +# DinD, pas de `--privileged`, pas d'attente TCP). Le runner doit donc +# autoriser ce mount (config act_runner : `valid_volumes` inclut +# `/var/run/docker.sock`) et son hôte doit avoir un daemon Docker sain. # - Gitea app.ini : [actions] ENABLED=true, DEFAULT_ACTIONS_URL=https://github.com # - Droits d'écriture du runner sur son répertoire de travail/cache. # @@ -53,7 +55,7 @@ jobs: path: | /go/pkg/mod ~/.cache/go-build - key: go-${{ runner.os }}-${{ hashFiles('backend/go.sum') }} + key: go-${{ runner.os }}-${{ hashFiles('backend/go.mod', 'backend/go.sum') }} restore-keys: | go-${{ runner.os }}- @@ -76,7 +78,7 @@ jobs: path: | ~/.gradle/caches ~/.gradle/wrapper - key: gradle-${{ runner.os }}-${{ hashFiles('mobile-kotlin/gradle/libs.versions.toml') }} + key: gradle-${{ runner.os }}-${{ hashFiles('mobile-kotlin/gradle/libs.versions.toml', 'mobile-kotlin/gradle.properties', 'mobile-kotlin/settings.gradle.kts', 'mobile-kotlin/build.gradle.kts', 'mobile-kotlin/app/build.gradle.kts') }} restore-keys: | gradle-${{ runner.os }}- - run: ./gradlew :app:lint -q @@ -109,7 +111,7 @@ jobs: path: | /go/pkg/mod ~/.cache/go-build - key: go-${{ runner.os }}-${{ hashFiles('backend/go.sum') }} + key: go-${{ runner.os }}-${{ hashFiles('backend/go.mod', 'backend/go.sum') }} restore-keys: | go-${{ runner.os }}- - run: | @@ -143,7 +145,7 @@ jobs: path: | ~/.gradle/caches ~/.gradle/wrapper - key: gradle-${{ runner.os }}-${{ hashFiles('mobile-kotlin/gradle/libs.versions.toml') }} + key: gradle-${{ runner.os }}-${{ hashFiles('mobile-kotlin/gradle/libs.versions.toml', 'mobile-kotlin/gradle.properties', 'mobile-kotlin/settings.gradle.kts', 'mobile-kotlin/build.gradle.kts', 'mobile-kotlin/app/build.gradle.kts') }} restore-keys: | gradle-${{ runner.os }}- - run: ./gradlew :app:testDebugUnitTest -q @@ -190,23 +192,15 @@ jobs: # pas sur tag (c'est release.yml qui construit, évite une course dans le # registre entre le job `docker` et `release-docker`). if: github.event_name == 'push' && github.ref_type == 'branch' + # Daemon Docker de l'hôte du runner via socket monté (pas de DinD : + # act_runner ne supporte pas `services.docker:docker-dind + --privileged` + # de façon fiable — le daemon TCP 2375 restait injoignable après 60s). + # Prérequis runner : mount autorisé (valid_volumes inclut /var/run/docker.sock). container: image: docker:27 + options: -v /var/run/docker.sock:/var/run/docker.sock env: - DOCKER_HOST: tcp://docker:2375 - DOCKER_TLS_CERTDIR: "" - services: - docker: - image: docker:27-dind - env: - DOCKER_TLS_CERTDIR: "" - options: >- - --privileged - --health-cmd "docker info" - --health-interval 5s - --health-timeout 5s - --health-retries 12 - --health-start-period 5s + DOCKER_HOST: unix:///var/run/docker.sock steps: - name: Install node + git (actions JS) run: apk add --no-cache nodejs git @@ -215,21 +209,11 @@ jobs: with: token: ${{ secrets.GITEA_TOKEN }} - - name: Attendre le daemon Docker (dind) - env: - DOCKER_HOST: tcp://docker:2375 + - name: Sanity daemon Docker hôte run: | set -euo pipefail - for i in $(seq 1 30); do - if docker info >/dev/null 2>&1; then - echo "daemon Docker prêt" - exit 0 - fi - sleep 2 - done - echo "Daemon Docker injoignable après 60s" >&2 - docker info >&2 || true - exit 1 + docker info >/dev/null + echo "daemon Docker hôte joignable" - name: Login registre Gitea env: @@ -240,16 +224,26 @@ jobs: : "${CONTAINER_REGISTRY_TOKEN:?CONTAINER_REGISTRY_TOKEN manquant (PAT scope write:package)}" : "${CONTAINER_REGISTRY_USER:?CONTAINER_REGISTRY_USER manquant (propriétaire du PAT)}" echo "$CONTAINER_REGISTRY_TOKEN" | docker login "$REGISTRY_HOST" -u "$CONTAINER_REGISTRY_USER" --password-stdin - echo "REGISTRY_IMAGE=${REGISTRY_HOST}/${{ github.repository_owner }}/kazier" >> "$GITHUB_ENV" - echo "IMAGE_TAG=${GITHUB_REF_NAME}" >> "$GITHUB_ENV" + # Le registre impose un namespace minuscule (github.repository_owner + # peut être `Thirdshop` avec une majuscule → tag Docker invalide). + OWNER_LC="$(printf '%s' "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')" + echo "REGISTRY_IMAGE=${REGISTRY_HOST}/${OWNER_LC}/kazier" >> "$GITHUB_ENV" + echo "SHA_TAG=sha-$(printf '%s' "$GITHUB_SHA" | cut -c1-7)" >> "$GITHUB_ENV" - name: Build + push (registre Gitea) run: | set -euo pipefail + # --pull : base alpine/golang fraîche ; --cache-from : réutilise les + # layers du dernier build `main` si dispo (build plus rapide). + docker pull "$REGISTRY_IMAGE:main" 2>/dev/null || true docker build \ + --pull \ + --cache-from "$REGISTRY_IMAGE:main" \ --build-arg VERSION="$(cat VERSION)" \ --build-arg BUILD_DATE="$(date -u +%Y-%m-%dT%H:%M:%SZ)" \ - -t "$REGISTRY_IMAGE:$IMAGE_TAG" \ + -t "$REGISTRY_IMAGE:main" \ + -t "$REGISTRY_IMAGE:$SHA_TAG" \ ./backend - docker run --rm "$REGISTRY_IMAGE:$IMAGE_TAG" --version - docker push "$REGISTRY_IMAGE:$IMAGE_TAG" \ No newline at end of file + docker run --rm "$REGISTRY_IMAGE:$SHA_TAG" --version + docker push "$REGISTRY_IMAGE:main" + docker push "$REGISTRY_IMAGE:$SHA_TAG" \ No newline at end of file diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 6aab921..02321ed 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -4,6 +4,10 @@ # asset (API, équivalent de `glab release create`), puis pousse l'image # kazier-server sur le registre conteneur Gitea + Docker Hub (tag + latest). # +# Prérequis act_runner : job `release-docker` utilise le daemon Docker de +# l'hôte via socket monté (pas de DinD) — `valid_volumes` doit autoriser +# /var/run/docker.sock. +# # Secrets (Settings > Actions) : # - RELEASE_KEYSTORE_B64 base64 du keystore release Android (jamais en clair) # - SIGNING_STORE_PASSWORD SIGNING_KEY_ALIAS SIGNING_KEY_PASSWORD @@ -40,7 +44,7 @@ jobs: path: | ~/.gradle/caches ~/.gradle/wrapper - key: gradle-${{ runner.os }}-${{ hashFiles('mobile-kotlin/gradle/libs.versions.toml') }} + key: gradle-${{ runner.os }}-${{ hashFiles('mobile-kotlin/gradle/libs.versions.toml', 'mobile-kotlin/gradle.properties', 'mobile-kotlin/settings.gradle.kts', 'mobile-kotlin/build.gradle.kts', 'mobile-kotlin/app/build.gradle.kts') }} restore-keys: | gradle-${{ runner.os }}- @@ -53,16 +57,22 @@ jobs: SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }} run: | set -euo pipefail + # Nettoie keystore + mots de passe même en cas d'échec du build. + cleanup() { rm -f app/release.keystore app/signing.properties; } + trap cleanup EXIT if [ -z "${RELEASE_KEYSTORE_B64:-}" ]; then echo "RELEASE_KEYSTORE_B64 manquant — release non signée." >&2 exit 1 fi + : "${SIGNING_STORE_PASSWORD:?SIGNING_STORE_PASSWORD manquant}" + : "${SIGNING_KEY_ALIAS:?SIGNING_KEY_ALIAS manquant}" + : "${SIGNING_KEY_PASSWORD:?SIGNING_KEY_PASSWORD manquant}" echo "$RELEASE_KEYSTORE_B64" | base64 -d > app/release.keystore cat > app/signing.properties </dev/null)" || NOTES="" + NOTES_JSON="$(python3 -c 'import json;print(json.dumps(open("CHANGELOG.md", encoding="utf-8").read()))')" + PAYLOAD_JSON="$(TAG="v${VERSION}" BODY="$NOTES_JSON" python3 -c 'import json,os;print(json.dumps({"tag_name":os.environ["TAG"],"name":"Kazier "+os.environ["TAG"],"body":json.loads(os.environ["BODY"])}))')" RELEASE_JSON="$(curl -sSf -X POST "${API}/repos/${GITHUB_REPOSITORY}/releases" \ -H "${AUTH}" \ -H "Content-Type: application/json" \ - -d "{\"tag_name\":\"v${VERSION}\",\"name\":\"Kazier v${VERSION}\",\"body\":${NOTES}}")" - RELEASE_ID="$(printf '%s' "${RELEASE_JSON}" | grep -o '"id":[0-9]*' | head -1 | cut -d: -f2)" + -d "${PAYLOAD_JSON}")" + RELEASE_ID="$(printf '%s' "${RELEASE_JSON}" | python3 -c 'import json,sys;print(json.load(sys.stdin)["id"])')" + : "${RELEASE_ID:?id de release introuvable dans la réponse API}" curl -sSf -X POST \ "${API}/repos/${GITHUB_REPOSITORY}/releases/${RELEASE_ID}/assets?name=app-release.apk" \ -H "${AUTH}" \ @@ -87,23 +99,12 @@ jobs: release-docker: runs-on: ubuntu-24.04 + # Socket hôte, pas de DinD (même raison que CI/docker). container: image: docker:27 + options: -v /var/run/docker.sock:/var/run/docker.sock env: - DOCKER_HOST: tcp://docker:2375 - DOCKER_TLS_CERTDIR: "" - services: - docker: - image: docker:27-dind - env: - DOCKER_TLS_CERTDIR: "" - options: >- - --privileged - --health-cmd "docker info" - --health-interval 5s - --health-timeout 5s - --health-retries 12 - --health-start-period 5s + DOCKER_HOST: unix:///var/run/docker.sock steps: - name: Install node + git (actions JS) run: apk add --no-cache nodejs git @@ -112,21 +113,11 @@ jobs: with: token: ${{ secrets.GITEA_TOKEN }} - - name: Attendre le daemon Docker (dind) - env: - DOCKER_HOST: tcp://docker:2375 + - name: Sanity daemon Docker hôte run: | set -euo pipefail - for i in $(seq 1 30); do - if docker info >/dev/null 2>&1; then - echo "daemon Docker prêt" - exit 0 - fi - sleep 2 - done - echo "Daemon Docker injoignable après 60s" >&2 - docker info >&2 || true - exit 1 + docker info >/dev/null + echo "daemon Docker hôte joignable" - name: Login registre Gitea env: @@ -137,19 +128,25 @@ jobs: : "${CONTAINER_REGISTRY_TOKEN:?CONTAINER_REGISTRY_TOKEN manquant (PAT scope write:package)}" : "${CONTAINER_REGISTRY_USER:?CONTAINER_REGISTRY_USER manquant (propriétaire du PAT)}" echo "$CONTAINER_REGISTRY_TOKEN" | docker login "$API_HOST" -u "$CONTAINER_REGISTRY_USER" --password-stdin - echo "REGISTRY_IMAGE=${API_HOST}/${{ github.repository_owner }}/kazier" >> "$GITHUB_ENV" + OWNER_LC="$(printf '%s' "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')" + echo "REGISTRY_IMAGE=${API_HOST}/${OWNER_LC}/kazier" >> "$GITHUB_ENV" - - name: "Build + push (registre Gitea : vX.Y.Z)" + - name: "Build + push (registre Gitea : vX.Y.Z + latest)" run: | set -euo pipefail VERSION="$(cat VERSION)" + docker pull "$REGISTRY_IMAGE:latest" 2>/dev/null || true docker build \ + --pull \ + --cache-from "$REGISTRY_IMAGE:latest" \ --build-arg VERSION="${VERSION}" \ --build-arg BUILD_DATE="$(date -u +%Y-%m-%dT%H:%M:%SZ)" \ -t "$REGISTRY_IMAGE:v${VERSION}" \ + -t "$REGISTRY_IMAGE:latest" \ ./backend docker run --rm "$REGISTRY_IMAGE:v${VERSION}" --version docker push "$REGISTRY_IMAGE:v${VERSION}" + docker push "$REGISTRY_IMAGE:latest" echo "TAG=v${VERSION}" >> "$GITHUB_ENV" - name: Push Docker Hub (tag + latest)