Compare commits
4
Commits
22286aa2b1
...
v0.1.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
225f6e4b93 | ||
|
|
f97e0aed45 | ||
|
|
9dbd9d7a11 | ||
|
|
33ff9a6789 |
@@ -0,0 +1,28 @@
|
||||
# Production — copier vers .env.prod (jamais commité) et adapter.
|
||||
# Utilisé avec : docker compose -f docker-compose.prod.yml --env-file .env.prod [pull|up -d]
|
||||
|
||||
# Image (registre Gitea). VERSION=latest par défaut ; pincer pour figer, ex. :
|
||||
# VERSION=v0.1.0 (le tag release inclut le "v", cf. release.yml)
|
||||
REGISTRY_IMAGE=gitea.thirdshop.fr/thirdshop/kazier
|
||||
VERSION=latest
|
||||
|
||||
# Port d'écoute exposé sur l'hôte (derrière Caddy/Nginx/TLS en prod publique)
|
||||
PORT=8080
|
||||
|
||||
# Postgres (mots de passe forts, générés, uniques à la prod)
|
||||
POSTGRES_DB=kazier
|
||||
POSTGRES_USER=kazier
|
||||
POSTGRES_PASSWORD=CHANGE_ME_GENERER_UN_SECRET_LONG
|
||||
|
||||
# Backend
|
||||
MAX_FILE_SIZE_MB=50
|
||||
OCR_LANG=fra+eng
|
||||
|
||||
# Sécurité — générer un secret long et aléatoire, ex. :
|
||||
# openssl rand -base64 48
|
||||
AUTH_SECRET=CHANGE_ME_GENERER_UN_SECRET_LONG
|
||||
|
||||
# Premier admin (créé UNIQUEMENT si la table users est vide au premier boot).
|
||||
# L'env n'écrase jamais un compte existant.
|
||||
ADMIN_USERNAME=admin
|
||||
ADMIN_PASSWORD=CHANGE_ME_MOT_DE_PASSE_INITIAL_FORT
|
||||
@@ -2,7 +2,8 @@
|
||||
#
|
||||
# Construit l'APK signé (assembleRelease), crée la Release Gitea avec l'APK en
|
||||
# asset (API, équivalent de `glab release create`), puis pousse l'image
|
||||
# kazier-server sur le registre conteneur Gitea + Docker Hub (tag + latest).
|
||||
# kazier-server sur le registre conteneur Gitea (tag + latest).
|
||||
# Déploiement perso uniquement : pas de push Docker Hub.
|
||||
#
|
||||
# Prérequis act_runner : job `release-docker` s'exécute directement sur
|
||||
# l'hôte et utilise le daemon Docker local (pas de conteneur `docker:27`,
|
||||
@@ -17,7 +18,6 @@
|
||||
# - RELEASE_API_TOKEN PAT scope write:repository (API : création Release)
|
||||
# - CONTAINER_REGISTRY_TOKEN PAT scope write:package (registre conteneur Gitea)
|
||||
# - CONTAINER_REGISTRY_USER utilisateur propriétaire du PAT ci-dessus
|
||||
# - DOCKERHUB_USER DOCKERHUB_TOKEN PAT Docker Hub (push public)
|
||||
|
||||
name: Release
|
||||
|
||||
@@ -30,7 +30,6 @@ permissions:
|
||||
|
||||
env:
|
||||
ANDROID_IMAGE: cimg/android:2024.01-node
|
||||
DOCKERHUB_IMAGE: docker.io/thirdshop/kazier
|
||||
# API Gitea (host de l'instance)
|
||||
API_HOST: gitea.thirdshop.fr
|
||||
|
||||
@@ -53,6 +52,7 @@ jobs:
|
||||
|
||||
- name: Signer + assembler l'APK release
|
||||
working-directory: mobile-kotlin
|
||||
shell: bash
|
||||
env:
|
||||
RELEASE_KEYSTORE_B64: ${{ secrets.RELEASE_KEYSTORE_B64 }}
|
||||
SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
|
||||
@@ -80,25 +80,41 @@ jobs:
|
||||
./gradlew :app:assembleRelease -q
|
||||
|
||||
- name: Créer la Release Gitea + upload APK
|
||||
shell: bash
|
||||
env:
|
||||
RELEASE_API_TOKEN: ${{ secrets.RELEASE_API_TOKEN }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
VERSION="$(cat VERSION)"
|
||||
TAG="v${VERSION}"
|
||||
API="https://${API_HOST}/api/v1"
|
||||
AUTH="Authorization: token ${RELEASE_API_TOKEN:?RELEASE_API_TOKEN manquant (PAT scope write:repository)}"
|
||||
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 "${PAYLOAD_JSON}")"
|
||||
# Idempotent : si la release du tag existe déjà (re-tag, retry du job),
|
||||
# la réutiliser au lieu d'échouer en 409.
|
||||
if RELEASE_JSON="$(curl -sSf -H "${AUTH}" "${API}/repos/${GITHUB_REPOSITORY}/releases/tags/${TAG}" 2>/dev/null)"; then
|
||||
echo "Release ${TAG} existante — réutilisation."
|
||||
else
|
||||
PAYLOAD_JSON="$(TAG="${TAG}" 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 "${PAYLOAD_JSON}")"
|
||||
fi
|
||||
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}"
|
||||
# Asset idempotent : remplace l'APK existant de même nom s'il y en a un.
|
||||
APK_PATH="mobile-kotlin/app/build/outputs/apk/release/app-release.apk"
|
||||
EXISTING_ASSET_ID="$(curl -sSf -H "${AUTH}" "${API}/repos/${GITHUB_REPOSITORY}/releases/${RELEASE_ID}/assets" \
|
||||
| python3 -c 'import json,sys;assets=json.load(sys.stdin);print(next((str(a["id"]) for a in assets if a.get("name")=="app-release.apk"),""))')"
|
||||
if [ -n "${EXISTING_ASSET_ID}" ]; then
|
||||
echo "Asset existant ${EXISTING_ASSET_ID} — suppression avant re-upload."
|
||||
curl -sSf -X DELETE -H "${AUTH}" "${API}/repos/${GITHUB_REPOSITORY}/releases/${RELEASE_ID}/assets/${EXISTING_ASSET_ID}" > /dev/null
|
||||
fi
|
||||
curl -sSf -X POST \
|
||||
"${API}/repos/${GITHUB_REPOSITORY}/releases/${RELEASE_ID}/assets?name=app-release.apk" \
|
||||
-H "${AUTH}" \
|
||||
-F "attachment=@mobile-kotlin/app/build/outputs/apk/release/app-release.apk"
|
||||
-F "attachment=@${APK_PATH}"
|
||||
|
||||
release-docker:
|
||||
runs-on: ubuntu-24.04
|
||||
@@ -111,12 +127,14 @@ jobs:
|
||||
token: ${{ secrets.GITEA_TOKEN }}
|
||||
|
||||
- name: Sanity daemon Docker hôte
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
docker info >/dev/null
|
||||
echo "daemon Docker hôte joignable"
|
||||
|
||||
- name: Login registre Gitea
|
||||
shell: bash
|
||||
env:
|
||||
CONTAINER_REGISTRY_TOKEN: ${{ secrets.CONTAINER_REGISTRY_TOKEN }}
|
||||
CONTAINER_REGISTRY_USER: ${{ secrets.CONTAINER_REGISTRY_USER }}
|
||||
@@ -129,6 +147,7 @@ jobs:
|
||||
echo "REGISTRY_IMAGE=${API_HOST}/${OWNER_LC}/kazier" >> "$GITHUB_ENV"
|
||||
|
||||
- name: "Build + push (registre Gitea : vX.Y.Z + latest)"
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
VERSION="$(cat VERSION)"
|
||||
@@ -143,20 +162,4 @@ jobs:
|
||||
./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)
|
||||
env:
|
||||
DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
|
||||
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
: "${DOCKERHUB_USER:?DOCKERHUB_USER manquant}"
|
||||
: "${DOCKERHUB_TOKEN:?DOCKERHUB_TOKEN manquant}"
|
||||
IMAGE="$DOCKERHUB_IMAGE"
|
||||
echo "$DOCKERHUB_TOKEN" | docker login -u "$DOCKERHUB_USER" --password-stdin docker.io
|
||||
docker tag "$REGISTRY_IMAGE:$TAG" "$IMAGE:$TAG"
|
||||
docker tag "$REGISTRY_IMAGE:$TAG" "$IMAGE:latest"
|
||||
docker push "$IMAGE:$TAG"
|
||||
docker push "$IMAGE:latest"
|
||||
docker push "$REGISTRY_IMAGE:latest"
|
||||
@@ -0,0 +1,51 @@
|
||||
# Déploiement perso — pull l'image depuis le registre Gitea (pas de build local).
|
||||
#
|
||||
# Usage sur le serveur :
|
||||
# 1. cp .env.prod.example .env.prod && adapter (mots de passe forts, jamais commité)
|
||||
# 2. echo "<PAT read:package>" | docker login gitea.thirdshop.fr -u <user> --password-stdin
|
||||
# 3. docker compose -f docker-compose.prod.yml --env-file .env.prod pull
|
||||
# 4. docker compose -f docker-compose.prod.yml --env-file .env.prod up -d
|
||||
# 5. curl http://localhost:${PORT:-8080}/api/v1/health
|
||||
#
|
||||
# MAJ : répéter pull + up -d (ou tag précis via VERSION=x.y.z).
|
||||
|
||||
services:
|
||||
postgres:
|
||||
image: postgres:17-alpine
|
||||
environment:
|
||||
POSTGRES_DB: ${POSTGRES_DB:-kazier}
|
||||
POSTGRES_USER: ${POSTGRES_USER:-kazier}
|
||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?POSTGRES_PASSWORD requis (.env.prod)}
|
||||
volumes:
|
||||
- postgres-data:/var/lib/postgresql/data
|
||||
restart: unless-stopped
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-kazier}"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
|
||||
backend:
|
||||
# Image publiée par la release Gitea (tag vX.Y.Z + latest).
|
||||
image: ${REGISTRY_IMAGE:-gitea.thirdshop.fr/thirdshop/kazier}:${VERSION:-latest}
|
||||
ports:
|
||||
- "${PORT:-8080}:8080"
|
||||
environment:
|
||||
PORT: 8080
|
||||
DATABASE_URL: postgres://${POSTGRES_USER:-kazier}:${POSTGRES_PASSWORD:?POSTGRES_PASSWORD requis}@postgres:5432/${POSTGRES_DB:-kazier}?sslmode=disable
|
||||
UPLOAD_DIR: /app/uploads
|
||||
MAX_FILE_SIZE_MB: ${MAX_FILE_SIZE_MB:-50}
|
||||
OCR_LANG: ${OCR_LANG:-fra+eng}
|
||||
AUTH_SECRET: ${AUTH_SECRET:?AUTH_SECRET requis (.env.prod)}
|
||||
ADMIN_USERNAME: ${ADMIN_USERNAME:?ADMIN_USERNAME requis au premier démarrage}
|
||||
ADMIN_PASSWORD: ${ADMIN_PASSWORD:?ADMIN_PASSWORD requis au premier démarrage}
|
||||
volumes:
|
||||
- backend-uploads:/app/uploads
|
||||
depends_on:
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
restart: unless-stopped
|
||||
|
||||
volumes:
|
||||
postgres-data:
|
||||
backend-uploads:
|
||||
@@ -28,6 +28,7 @@
|
||||
<string name="review_mark_all_message">The remaining documents will be marked as reviewed and synced to the cloud without being checked.</string>
|
||||
<string name="review_load_error">Could not load the documents to review.</string>
|
||||
<string name="review_delete_error">Could not delete this document — permission denied.</string>
|
||||
<string name="review_keep_error">Could not keep this document — try again.</string>
|
||||
<string name="browse_up">Up</string>
|
||||
<string name="move_here_count">Move here (%1$d)</string>
|
||||
<string name="move_pick_title">Move %1$d file(s)…</string>
|
||||
|
||||
Reference in New Issue
Block a user