Fixed versions

Author: brammittendorff

.github/workflows/ci-cd.yml

@@ -220,22 +220,22 @@ jobs:
       - name: Get Version for Docker Build
         id: get_version
         run: |
-          # Fetch all tags to ensure we have the complete history
+          # Ensure we have tags
           git fetch --tags --force
           
-          # Get the latest tag, remove 'v' prefix, use default if no tags
-          VERSION=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.1.0")
-          VERSION="${VERSION#v}"
-          
           # For tagged builds, use the exact tag
           if [[ "$GITHUB_REF" == refs/tags/* ]]; then
             TAG=${GITHUB_REF#refs/tags/}
-            VERSION="${TAG#v}"
-            echo "Using tag version: $VERSION (from $TAG)"
+            # Keep the v prefix for git tags
+            VERSION="$TAG"
+            echo "Using tag version: $VERSION"
           else
+            # Use git version with v prefix
+            VERSION=$(git describe --tags --always 2>/dev/null || echo "v0.1.0")
             echo "Using git version: $VERSION"
           fi
           
+          # Output for GitHub Actions
           echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
           
       - name: Build and Push Docker Image

Dockerfile

@@ -6,20 +6,20 @@ ARG VERSION="0.1.0"
 
 WORKDIR /app
 
-# Install git to properly detect version during build
+# Install git for versioning
 RUN apt-get update && apt-get install -y git && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Copy requirements and install dependencies first
 COPY requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
 
-# Copy everything needed for versioning and installation
+# Copy source code for installation
 COPY . .
 
-# Disable setuptools_scm and use the provided version
+# Use setuptools_scm with the version passed from the build
 ENV SETUPTOOLS_SCM_PRETEND_VERSION=$VERSION
 
-# Install the package with proper versioning support
+# Install the package
 RUN pip install --no-cache-dir .
 
 # Create a wrapper script to allow more flexibility