From 318329a683869e5c1a6225f6d4837f9dbecefe8b Mon Sep 17 00:00:00 2001 From: m Date: Thu, 17 Sep 2026 18:52:53 +0200 Subject: [PATCH] update signing properties + gitlab ci --- .gitlab-ci.yml | 7 +++---- backend/Dockerfile | 2 +- mobile-kotlin/app/signing.properties.example | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c85fd37..7df6305 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,10 +10,9 @@ # - SIGNING_STORE_PASSWORD SIGNING_KEY_ALIAS SIGNING_KEY_PASSWORD # - GITLAB_API_TOKEN token (scope api, write_repository) pour créer la GitLab Release # - DOCKERHUB_USER DOCKERHUB_TOKEN PAT Docker Hub (push public) -# - DOCKERHUB_NAMESPACE namespace Docker Hub (placeholder) # # Publication : à chaque tag vX.Y.Z → GitLab Release (APK attaché, latest + -# historique) + image $CI_REGISTRY + image Docker Hub. +# historique) + image $CI_REGISTRY + image Docker Hub (docker.io/thirdshop/kasier). stages: - lint @@ -28,6 +27,7 @@ variables: ANDROID_IMAGE: "cimg/android:2024.01" GRADLE_USER_HOME: "$CI_PROJECT_DIR/.gradle-home" CGO_ENABLED: "0" + DOCKERHUB_IMAGE: "docker.io/thirdshop/kasier" GLAB_VERSION: "1.118.0" default: @@ -185,9 +185,8 @@ release-docker: - | : "${DOCKERHUB_USER:?DOCKERHUB_USER manquant}" : "${DOCKERHUB_TOKEN:?DOCKERHUB_TOKEN manquant}" - : "${DOCKERHUB_NAMESPACE:?DOCKERHUB_NAMESPACE manquant}" echo "$DOCKERHUB_TOKEN" | docker login -u "$DOCKERHUB_USER" --password-stdin docker.io - IMAGE="$DOCKERHUB_NAMESPACE/kazier" + IMAGE="$DOCKERHUB_IMAGE" docker tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" "$IMAGE:$CI_COMMIT_TAG" docker tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" "$IMAGE:latest" docker push "$IMAGE:$CI_COMMIT_TAG" diff --git a/backend/Dockerfile b/backend/Dockerfile index 114fdd3..2a6fc9b 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -34,7 +34,7 @@ LABEL org.opencontainers.image.title="kazier-server" \ org.opencontainers.image.description="Kazier backend API (Go/Gin + PostgreSQL) — local-first document vault" \ org.opencontainers.image.version="${VERSION}" \ org.opencontainers.image.licenses="AGPL-3.0-only" \ - org.opencontainers.image.source="https://gitlab.com/thirdshop-org/dot" \ + org.opencontainers.image.source="https://gitlab.thirdshop.fr/thirdshop/kasier" \ org.opencontainers.image.url="https://thirdshop.fr/en/applications/kazier/" \ org.opencontainers.image.created="${BUILD_DATE}" \ org.opencontainers.image.revision="" diff --git a/mobile-kotlin/app/signing.properties.example b/mobile-kotlin/app/signing.properties.example index 78bbf4d..96c6743 100644 --- a/mobile-kotlin/app/signing.properties.example +++ b/mobile-kotlin/app/signing.properties.example @@ -4,7 +4,7 @@ # 1. Générer un keystore (ne jamais le committer, garder en lieu sûr) : # keytool -genkey -v -keystore release.keystore -alias kazier \ # -keyalg RSA -keysize 2048 -validity 10000 -# Note : un keystore existant garde SON alias d'origine (ex. vaultdrop) — +# Note : un keystore existant garde SON alias d'origine (ex. kazier) — # reporter alors la même valeur dans keyAlias ci-dessous. # 2. Renseigner les valeurs ci-dessous. #