diff --git a/.gitea/workflows/publish.yml b/.gitea/workflows/publish.yml index 39a8b92..3c238de 100644 --- a/.gitea/workflows/publish.yml +++ b/.gitea/workflows/publish.yml @@ -2,17 +2,17 @@ name: publish-images on: push: - branches: [ dev, main ] - tags: [ 'v*' ] + branches: [ '**' ] + tags: [ '*' ] env: REGISTRY: git.4nkweb.com IMAGE_OWNER: 4nk - IMAGE_REPO: 4NK_IA_back + IMAGE_REPO: 4nk-ia-back jobs: docker-build-and-push: - runs-on: ubuntu-latest + runs-on: debian-runner steps: - name: Checkout uses: actions/checkout@v4 @@ -33,13 +33,20 @@ jobs: - name: Compute tags id: meta run: | - if [[ "${GITHUB_REF_TYPE}" == "tag" ]]; then - VERSION_TAG="${GITHUB_REF_NAME}" + set -euo pipefail + # Déterminer si l'on est sur un tag exact + if TAG_NAME=$(git describe --tags --exact-match 2>/dev/null); then + VERSION_TAG="$TAG_NAME" else - SHORT_SHA=$(echo "${GITHUB_SHA}" | cut -c1-8) - VERSION_TAG="sha-${SHORT_SHA}" + BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD) + if [[ "$BRANCH_NAME" == "HEAD" ]]; then + SHORT_SHA=$(git rev-parse --short=8 HEAD) + VERSION_TAG="sha-${SHORT_SHA}" + else + VERSION_TAG=$(echo "$BRANCH_NAME" | tr '/' '-') + fi fi - echo "version=${VERSION_TAG}" >> $GITHUB_OUTPUT + echo "version=${VERSION_TAG}" >> "$GITHUB_OUTPUT" - name: Build & Push host-api uses: docker/build-push-action@v6 diff --git a/docker-compose.registry.yml b/docker-compose.registry.yml new file mode 100644 index 0000000..cf43f64 --- /dev/null +++ b/docker-compose.registry.yml @@ -0,0 +1,8 @@ +services: + host-api: + image: git.4nkweb.com/4nk/4nk-ia-back/host-api:${IMAGE_TAG:-dev} + + worker: + image: git.4nkweb.com/4nk/4nk-ia-back/worker:${IMAGE_TAG:-dev} + +