From 7de99ef9453cecb123afcc27b11fa6e76935822e Mon Sep 17 00:00:00 2001 From: SBCrumb Date: Mon, 22 Sep 2025 10:12:07 -0400 Subject: [PATCH] trying to add gitea --- .gitea/workflows/ci-dev.yml | 1 + .gitea/workflows/ci.yml | 1 + Dockerfile | 5 +++-- nfoguard.py | 7 ++++--- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/ci-dev.yml b/.gitea/workflows/ci-dev.yml index fa44ee1..fe78142 100644 --- a/.gitea/workflows/ci-dev.yml +++ b/.gitea/workflows/ci-dev.yml @@ -97,6 +97,7 @@ jobs: docker build \ $CACHE_ARGS \ --build-arg GIT_BRANCH=dev \ + --build-arg BUILD_SOURCE=gitea \ --tag nfoguard:dev \ --tag nfoguard:dev-${{ github.sha }} \ --tag "$CACHE_IMAGE" \ diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index ae112d9..2ca778b 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -100,6 +100,7 @@ jobs: docker build \ $CACHE_ARGS \ --build-arg GIT_BRANCH=main \ + --build-arg BUILD_SOURCE=gitea \ --tag nfoguard:latest \ --tag nfoguard:${{ github.sha }} \ --tag "$CACHE_IMAGE" \ diff --git a/Dockerfile b/Dockerfile index e49defa..4077c32 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,15 @@ FROM python:3.11-slim -# Build argument for git branch +# Build argument for git branch and build source ARG GIT_BRANCH=main +ARG BUILD_SOURCE= # Set environment variables ENV PYTHONDONTWRITEBYTECODE=1 \ PYTHONUNBUFFERED=1 \ PYTHONIOENCODING=utf-8 \ GIT_BRANCH=${GIT_BRANCH} \ - GITEA_BUILD=true + BUILD_SOURCE=${BUILD_SOURCE} # Install system dependencies including PostgreSQL client libraries RUN apt-get update && apt-get install -y \ diff --git a/nfoguard.py b/nfoguard.py index 83040ce..dec66d6 100644 --- a/nfoguard.py +++ b/nfoguard.py @@ -1397,9 +1397,10 @@ except Exception: # If git detection fails, that's fine - use base version pass -# Check for Gitea build environment variable -if os.environ.get("GITEA_BUILD") == "true": - if "-" not in version: # Don't double-add suffixes +# Check for build source (only add -gitea for local Gitea builds) +build_source = os.environ.get("BUILD_SOURCE", "") +if build_source == "gitea": + if "gitea" not in version: # Don't double-add gitea suffix version = f"{version}-gitea" app = FastAPI(