diff --git a/.gitea/workflows/ci-dev.yml b/.gitea/workflows/ci-dev.yml index 5cc2d21..5772075 100644 --- a/.gitea/workflows/ci-dev.yml +++ b/.gitea/workflows/ci-dev.yml @@ -94,11 +94,15 @@ jobs: # Build DEV image with cache (if available) echo "Building DEV image with layer caching..." + VERSION=$(cat VERSION 2>/dev/null || echo "unknown") + echo "Building version: $VERSION" + docker build \ $CACHE_ARGS \ --build-arg GIT_BRANCH=dev \ --build-arg BUILD_SOURCE=gitea \ --tag nfoguard:dev \ + --tag nfoguard:${VERSION}-dev-gitea \ --tag nfoguard:dev-${{ github.sha }} \ --tag "$CACHE_IMAGE" \ . @@ -119,7 +123,9 @@ jobs: echo "✅ DEV Login succeeded" # Tag for local registry + VERSION=$(cat VERSION 2>/dev/null || echo "unknown") docker tag nfoguard:dev "$LOCAL_REGISTRY/sbcrumb/nfoguard:dev" + docker tag nfoguard:${VERSION}-dev-gitea "$LOCAL_REGISTRY/sbcrumb/nfoguard:${VERSION}-dev-gitea" docker tag nfoguard:dev "$LOCAL_REGISTRY/sbcrumb/nfoguard:dev-${{ github.sha }}" # Push DEV images @@ -130,6 +136,11 @@ jobs: if timeout 120 docker --config $DOCKER_CONFIG push "$LOCAL_REGISTRY/sbcrumb/nfoguard:dev"; then echo "✅ DEV tag pushed successfully" + echo "=== Pushing version-dev-gitea tag ===" + if timeout 60 docker --config $DOCKER_CONFIG push "$LOCAL_REGISTRY/sbcrumb/nfoguard:${VERSION}-dev-gitea"; then + echo "✅ Version-dev-gitea tag pushed successfully: ${VERSION}-dev-gitea" + fi + if timeout 60 docker --config $DOCKER_CONFIG push "$LOCAL_REGISTRY/sbcrumb/nfoguard:dev-${{ github.sha }}"; then echo "✅ DEV SHA tag pushed successfully" fi @@ -141,6 +152,10 @@ jobs: echo "" echo "🎉 DEV build completed successfully!" echo "" + VERSION=$(cat VERSION 2>/dev/null || echo "unknown") echo "📦 Available DEV images:" - echo " Local only: nfoguard:dev" - echo " Local SHA: nfoguard:dev-${{ github.sha }}" \ No newline at end of file + echo " Local only: nfoguard:dev" + echo " Version tag: nfoguard:${VERSION}-dev-gitea" + echo " Local SHA: nfoguard:dev-${{ github.sha }}" + echo "" + echo "🐳 Pull with: docker pull 192.168.253.221:3000/sbcrumb/nfoguard:${VERSION}-dev-gitea" \ No newline at end of file diff --git a/VERSION b/VERSION index 15d45d4..bd8bf88 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.6.9 +1.7.0