diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f112f26..ad611ed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: Lint, Test, Tag, Build and Deploy DEV +name: Lint, Test, Tag, Build and Push on: push: @@ -20,6 +20,7 @@ on: env: REGISTRY: ghcr.io IMAGE_NAME: ${{ github.repository }} + IMAGE_SUFFIX: ${{ github.ref_name == 'master' && '' || format('-%s', github.ref_name) }} jobs: lint: @@ -103,7 +104,7 @@ jobs: id: meta uses: docker/metadata-action@v5 with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ github.ref_name }} + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}${{ env.IMAGE_SUFFIX }} tags: latest - name: Build and push Docker image @@ -112,7 +113,7 @@ jobs: context: . file: ./Dockerfile build-args: | - VERSION=${{ needs.tag.outputs.version }}-${{ github.ref_name }} + VERSION=${{ needs.tag.outputs.version }}${{ env.IMAGE_SUFFIX }} push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/app/main.py b/app/main.py index fb31ae0..35489df 100644 --- a/app/main.py +++ b/app/main.py @@ -5,7 +5,7 @@ from validate_email import validate_email app = FastAPI( title="MailConfirm API", description="API for telegram bot for confirming emails.", - version="0.1.1", + version="0.1.3", docs_url="/", redoc_url=None, debug=False,