From 6895d40f348503407207b001049f8bf04a24a2e9 Mon Sep 17 00:00:00 2001 From: Florian Date: Mon, 19 Oct 2026 11:16:12 +0200 Subject: [PATCH] Added git commit id to build process --- .gitea/workflows/build-local.yaml | 4 +++- .gitea/workflows/build.yaml | 4 +++- Dockerfile | 4 ++++ src/main.py | 2 ++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build-local.yaml b/.gitea/workflows/build-local.yaml index 8b09916..8e8f471 100644 --- a/.gitea/workflows/build-local.yaml +++ b/.gitea/workflows/build-local.yaml @@ -35,7 +35,9 @@ jobs: - name: Build and Push Docker Image run: | - docker build -t ghcr.io/gansejunge/${{ env.IMAGE_NAME }}:${{ steps.get_tag.outputs.next }} . + docker build \ + --build-arg COMMIT_ID=$(echo "${{ github.sha }}" | cut -c1-7) \ + -t ghcr.io/gansejunge/${{ env.IMAGE_NAME }}:${{ steps.get_tag.outputs.next }} . docker push ghcr.io/gansejunge/${{ env.IMAGE_NAME }}:${{ steps.get_tag.outputs.next }} - name: Clone ops-deployment repo diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 39d3898..b20bd8c 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -35,7 +35,9 @@ jobs: - name: Build and Push Docker Image run: | - docker build -t ghcr.io/gansejunge/${{ env.IMAGE_NAME }}:${{ steps.get_tag.outputs.next }} . + docker build \ + --build-arg COMMIT_ID=$(echo "${{ github.sha }}" | cut -c1-7) \ + -t ghcr.io/gansejunge/${{ env.IMAGE_NAME }}:${{ steps.get_tag.outputs.next }} . docker push ghcr.io/gansejunge/${{ env.IMAGE_NAME }}:${{ steps.get_tag.outputs.next }} - name: Clone ops-deployment repo diff --git a/Dockerfile b/Dockerfile index f41be2e..0c48267 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,5 +11,9 @@ FROM nvcr.io/nvidia/distroless/python:3.12-v4.1.6 COPY --from=builder /install /usr/local COPY --from=builder /app /app WORKDIR /app + +ARG COMMIT_ID=unknown +ENV COMMIT_ID=$COMMIT_ID + ENTRYPOINT ["python", "main.py"] diff --git a/src/main.py b/src/main.py index 5724df9..a653f59 100644 --- a/src/main.py +++ b/src/main.py @@ -1,5 +1,6 @@ import asyncio from contextlib import asynccontextmanager +import os import uvicorn from fastapi import Depends, FastAPI, HTTPException, Request, Response @@ -151,6 +152,7 @@ def handle_pihole( async def start_servers(): logger.info("[Server] Starting main and metrics servers") + logger.info(f"[Server] Build commit id={os.getenv("COMMIT_ID","unknown")}") config_main = uvicorn.Config("main:api", host="0.0.0.0", port=5000, log_level=LOG_LEVEL.lower(), log_config=None) config_metrics = uvicorn.Config("metrics_server:metrics_api", host="0.0.0.0", port=9000, log_level=LOG_LEVEL.lower(), log_config=None)