fix last details

Author: eclipsevortex

.github/workflows/docker-workflow.yml

@@ -1,6 +1,7 @@
 name: Docker Build & Push All Services
 
 on:
+  delete:
   push:
     tags:
       - "v*.*.*"
@@ -20,22 +21,6 @@ jobs:
       - name: 🧠 Discover components and services
         id: set-matrix
         run: |
-          # Customize these lists as needed
-          EXCLUDED_COMPONENTS=(core validator)
-          EXCLUDED_SERVICES=()
-
-          should_exclude() {
-            local item=$1
-            shift
-            local list=("$@")
-            for ex in "${list[@]}"; do
-              if [[ "$item" == "$ex" ]]; then
-                return 0
-              fi
-            done
-            return 1
-          }
-
           mkdir -p .build/tmp_matrix
           echo '{ "include": [' > .build/tmp_matrix/matrix.json
           FIRST=true
@@ -44,32 +29,15 @@ jobs:
             [ -d "$comp" ] || continue
             comp_name=$(basename "$comp")
 
-            # 🔥 Skip excluded components
-            if should_exclude "$comp_name" "${EXCLUDED_COMPONENTS[@]}"; then
-              echo "⏭️ Skipping excluded component: $comp_name"
-              continue
-            fi
-
-            for service in "$comp"/*; do
-              [ -d "$service" ] || continue
-              service_name=$(basename "$service")
-
-              # 🔥 Skip excluded services
-              if should_exclude "$service_name" "${EXCLUDED_SERVICES[@]}"; then
-                echo "⏭️ Skipping excluded service: $service_name"
-                continue
-              fi
-
-              # ✅ Include only if it has a pyproject or version.py
-              if [[ -f "$service/pyproject.toml" || -f "$service/version.py" ]]; then
-                if [ "$FIRST" = true ]; then
-                  FIRST=false
-                else
-                  echo "," >> .build/tmp_matrix/matrix.json
-                fi
-                echo "  { \"component\": \"$comp_name\", \"service\": \"$service_name\" }" >> .build/tmp_matrix/matrix.json
+            # ✅ Include only if it has a pyproject or version.py
+            if [[ -f "$comp/pyproject.toml" || -f "$comp/version.py" ]]; then
+              if [ "$FIRST" = true ]; then
+                FIRST=false
+              else
+                echo "," >> .build/tmp_matrix/matrix.json
               fi
-            done
+              echo "  { \"component\": \"$comp_name\" }" >> .build/tmp_matrix/matrix.json
+            fi
           done
 
           echo "] }" >> .build/tmp_matrix/matrix.json
@@ -80,22 +48,26 @@ jobs:
 
           echo "🔍 Final matrix ready."
 
-  wheel-builder:
-    if: github.event_name == 'push'
+  build:
+    if: github.event_name == 'push' || github.event_name == 'delete'
+    needs: [discover]
     runs-on: ubuntu-latest
-    outputs:
-      tag: ${{ steps.meta.outputs.tag }}
+    permissions:
+      contents: read
+      packages: write
+    strategy:
+      matrix:
+        include: ${{ fromJson(needs.discover.outputs.matrix).include }}
+
     steps:
-      - name: 🧾 Checkout
+      - name: 🧾 Checkout repository
         uses: actions/checkout@v3
 
       - name: 🛠 Set up QEMU
         uses: docker/setup-qemu-action@v2
 
-      - name: 🛠 Set up Docker Buildx
+      - name: 🧱 Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-        with:
-          driver-opts: network=host
 
       - name: 🔐 Docker Login
         uses: docker/login-action@v2
@@ -110,44 +82,25 @@ jobs:
           echo "tag=subvortex/subvortex-wheel-builder:3.11-$HASH" >> $GITHUB_OUTPUT
 
       - name: 🐋 Build & push wheel-builder (only if not exists)
+        id: wheelbuilder
         run: |
-          if docker pull ${{ steps.meta.outputs.tag }} >/dev/null 2>&1; then
-            echo "✅ Image already exists: ${{ steps.meta.outputs.tag }}"
+          TAG="${{ steps.meta.outputs.tag }}"
+          LATEST_TAG="subvortex/subvortex-wheel-builder:latest"
+
+          if docker pull "$TAG" >/dev/null 2>&1; then
+            echo "✅ Image already exists: $TAG"
           else
             echo "🚀 Building wheel-builder image"
             docker buildx build \
-              --platform linux/amd64,linux/arm64 \
-              --tag ${{ steps.meta.outputs.tag }} \
+              --platform linux/amd64 \
+              --tag "$TAG" \
+              --tag "$LATEST_TAG" \
               --file subvortex/core/Dockerfile.builder \
               --push \
               .
           fi
 
-  build:
-    needs: [discover, wheel-builder]
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      matrix:
-        include: ${{ fromJson(needs.discover.outputs.matrix).include }}
-
-    steps:
-      - name: 🧾 Checkout repository
-        uses: actions/checkout@v3
-
-      - name: 🛠 Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: 🧱 Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: 🔐 Docker Login
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          echo "tag=$TAG" >> $GITHUB_OUTPUT
 
       - name: 🧠 Determine tag and floating tags
         id: taginfo
@@ -166,30 +119,48 @@ jobs:
       - name: 🚀 Build and push version-tagged image (on tag push only)
         if: startsWith(github.ref, 'refs/tags/') && github.event_name == 'push'
         run: |
-          COMP=${{ matrix.component }}
-          SERVICE=${{ matrix.service }}
-          IMAGE="subvortex/subvortex-$COMP-$SERVICE"
-          WHEEL_IMAGE="${{ needs.wheel-builder.outputs.tag }}"
-          RAW_VERSION_TAG="${{ steps.taginfo.outputs.version_tag }}"
-          VERSION_TAG="${RAW_VERSION_TAG#v}"
-          DOCKERFILE="subvortex/$COMP/$SERVICE/Dockerfile"
+          COMP="${{ matrix.component }}"
+          REPO_NAME="subvortex-${COMP//_/-}" && echo "$COMP"
+          IMAGE="subvortex/$REPO_NAME"
+          WHEEL_IMAGE="${{ steps.meta.outputs.tag }}"
+          VERSION_TAG="${{ steps.taginfo.outputs.version_tag }}"
+          VERSION="${VERSION_TAG#v}"
+          DOCKERFILE="subvortex/$COMP/Dockerfile"
+
+          echo "🔍 Searching for component version... $COMP / $IMAGE"
+          COMPONENT_PATH="subvortex/$COMP"
+          if [ -f "$COMPONENT_PATH/pyproject.toml" ]; then
+            echo "✅ Found pyproject.toml"
+            COMPONENT_VERSION=$(grep -E '^version\s*=' "$COMPONENT_PATH/pyproject.toml" | head -1 | sed -E 's/version\s*=\s*"([^"]+)"/\1/')
+          elif [ -f "$COMPONENT_PATH/version.py" ]; then
+            echo "✅ Found version.py"
+            COMPONENT_VERSION=$(python -c "import ast; f=open('$COMPONENT_PATH/version.py'); print([n.value.s for n in ast.walk(ast.parse(f.read())) if isinstance(n, ast.Assign) and n.targets[0].id == '__version__'][0])")
+          else
+            echo "❌ No version file found for component"
+            exit 1
+          fi
+
+          echo "🧾 Final versions:"
+          echo "VERSION=$VERSION"
+          echo "COMPONENT_VERSION=$COMPONENT_VERSION"
 
-          echo "🚀 Building image $IMAGE:$VERSION_TAG"
+          echo "🚀 Building image $IMAGE:$VERSION"
 
           docker buildx build \
             --squash \
-            --platform linux/amd64,linux/arm64 \
+            --platform linux/amd64 \
             --build-context wheelbuilder=docker-image://$WHEEL_IMAGE \
-            --build-arg VERSION=$VERSION_TAG \
-            --build-arg COMPONENT_VERSION=$VERSION_TAG \
-            --cache-from=type=gha,scope=wheels_${COMP}_${SERVICE}_${ARCH} \
-            --cache-to=type=gha,mode=max,scope=wheels_${COMP}_${SERVICE}_${ARCH} \
-            --tag $IMAGE:$VERSION_TAG \
+            --build-arg VERSION=$VERSION \
+            --build-arg COMPONENT_VERSION=$COMPONENT_VERSION \
+            --cache-from=type=gha,scope=wheels_${COMP}_${ARCH} \
+            --cache-to=type=gha,mode=max,scope=wheels_${COMP}_${ARCH} \
+            --tag $IMAGE:$VERSION \
             --file $DOCKERFILE \
             --push \
             .
 
   release:
+    if: github.event_name == 'release'
     needs: [discover]
     runs-on: ubuntu-latest
     permissions:
@@ -232,54 +203,53 @@ jobs:
       - name: 🚀 Retag and push floating tags (on release or prerelease)
         if: github.event_name == 'release' && github.event.action != 'deleted'
         run: |
-          COMP=${{ matrix.component }}
-          SERVICE=${{ matrix.service }}
-          IMAGE="subvortex/subvortex-$COMP-$SERVICE"
+          COMP="${{ matrix.component }}"
+          REPO_NAME="subvortex-${COMP//_/-}" && echo "$COMP"
+          IMAGE="subvortex/$REPO_NAME"
           RAW_VERSION_TAG="${{ steps.taginfo.outputs.version_tag }}"
-          VERSION_TAG="${RAW_VERSION_TAG#v}"
+          VERSION="${RAW_VERSION_TAG#v}"
           FLOATING_TAGS="${{ steps.taginfo.outputs.floating_tags }}"
           IS_PRERELEASE=${{ github.event.release.prerelease }}
           IS_DRAFT=${{ github.event.release.draft }}
-      
+
           echo "📦 Release type: prerelease=$IS_PRERELEASE, draft=$IS_DRAFT"
           echo "🏷️ Floating tags requested: $FLOATING_TAGS"
-      
+
           if [ "$IS_DRAFT" = "true" ]; then
             echo "⏭️ Skipping draft release"
             exit 0
           fi
-      
-          echo "🔍 Getting manifest for $IMAGE:$VERSION_TAG"
-          docker buildx imagetools inspect $IMAGE:$VERSION_TAG
-      
+
+          echo "🔍 Getting manifest for $IMAGE:$VERSION"
+          docker buildx imagetools inspect $IMAGE:$VERSION
+
           for TAG in $FLOATING_TAGS; do
             # Skip "latest" for prereleases
             if [ "$IS_PRERELEASE" = "true" ] && [ "$TAG" = "latest" ]; then
               echo "⏭️ Skipping 'latest' tag for prerelease"
               continue
             fi
-      
-            echo "🔁 Creating manifest for $IMAGE:$TAG from $IMAGE:$VERSION_TAG"
+
+            echo "🔁 Creating manifest for $IMAGE:$TAG from $IMAGE:$VERSION"
             docker buildx imagetools create \
               --tag $IMAGE:$TAG \
-              $IMAGE:$VERSION_TAG
+              $IMAGE:$VERSION
           done
 
       - name: 🧹 Remove floating tags (on release or prerelease delete)
         if: github.event_name == 'release' && github.event.action == 'deleted'
         run: |
-          COMP=${{ matrix.component }}
-          SERVICE=${{ matrix.service }}
-          IMAGE="subvortex/subvortex-$COMP-$SERVICE"
+          COMP="${{ matrix.component }}"
+          REPO_NAME="subvortex-${COMP//_/-}" && echo "$COMP"
+          IMAGE="subvortex/$REPO_NAME"
           RAW_VERSION_TAG="${{ github.event.release.tag_name }}"
-          VERSION_TAG="${RAW_VERSION_TAG#v}"
+          VERSION="${RAW_VERSION_TAG#v}"
           FLOATING_TAGS="${{ steps.taginfo.outputs.floating_tags }}"
           USERNAME="${{ secrets.DOCKER_USERNAME }}"
           PASSWORD="${{ secrets.DOCKER_PASSWORD }}"
-          REPO_NAME="subvortex-$COMP-$SERVICE"
 
-          echo "🗑️ Release deleted: $RAW_VERSION_TAG"
-          echo "🔍 Attempting to delete floating tags: $FLOATING_TAGS"
+          echo "🗑️ Release deleted: $VERSION"
+          echo "🔍 Handling floating tags: $FLOATING_TAGS"
 
           echo "🔐 Requesting Docker Hub JWT token..."
           TOKEN=$(curl -s -X POST https://hub.docker.com/v2/users/login/ \
@@ -291,18 +261,50 @@ jobs:
             exit 1
           fi
 
+          echo "📦 Fetching all tags from Docker Hub (excluding deleted tag: $VERSION)..."
+          ALL_TAGS=$(curl -s -H "Authorization: JWT $TOKEN" \
+            "https://hub.docker.com/v2/repositories/$USERNAME/$REPO_NAME/tags?page_size=100" | jq -r '.results[].name' | grep -v "^$VERSION$")
+
+          RELEASE_TAGS=$(echo "$ALL_TAGS" | grep -E '^[0-9]+\.[0-9]+\.[0-9]+$' || true)
+          PRERELEASE_TAGS=$(echo "$ALL_TAGS" | grep -E '^[0-9]+\.[0-9]+\.[0-9]+-(alpha|rc)\.[0-9]+$' || true)
+
           for TAG in $FLOATING_TAGS; do
-            echo "❌ Deleting tag: $IMAGE:$TAG"
-            RESPONSE=$(curl -s -o /dev/null -w "%{http_code}" -X DELETE \
-              "https://hub.docker.com/v2/repositories/$USERNAME/$REPO_NAME/tags/$TAG/" \
-              -H "Authorization: JWT $TOKEN")
-
-            if [ "$RESPONSE" = "204" ]; then
-              echo "✅ Successfully deleted $IMAGE:$TAG"
-            elif [ "$RESPONSE" = "404" ]; then
-              echo "⚠️ Tag $TAG not found (already deleted or never pushed)"
+            echo "🔁 Handling floating tag: $TAG"
+
+            case "$TAG" in
+              dev)
+                TARGET=$(echo "$PRERELEASE_TAGS" | grep 'alpha' | sort -Vr | head -n1)
+                ;;
+              stage)
+                TARGET=$(echo "$PRERELEASE_TAGS" | grep 'rc' | sort -Vr | head -n1)
+                ;;
+              latest)
+                TARGET=$(echo "$RELEASE_TAGS" | sort -Vr | head -n1)
+                ;;
+              *)
+                echo "⚠️ Unknown floating tag: $TAG"
+                continue
+                ;;
+            esac
+
+            if [ -n "$TARGET" ]; then
+              echo "🔄 Re-pointing $TAG to $TARGET as multi-platform manifest"
+              echo "$PASSWORD" | docker login -u "$USERNAME" --password-stdin
+              docker buildx imagetools create \
+                --tag "$IMAGE:$TAG" \
+                "$IMAGE:$TARGET"
+              docker logout
             else
-              echo "❌ Failed to delete tag $TAG (HTTP $RESPONSE)"
+              echo "🗑️ No matching version for $TAG. Deleting..."
+              RESPONSE=$(curl -s -o /dev/null -w "%{http_code}" -X DELETE \
+                "https://hub.docker.com/v2/repositories/$USERNAME/$REPO_NAME/tags/$TAG/" \
+                -H "Authorization: JWT $TOKEN")
+              if [ "$RESPONSE" = "204" ]; then
+                echo "✅ Deleted $IMAGE:$TAG"
+              elif [ "$RESPONSE" = "404" ]; then
+                echo "⚠️ Tag $TAG not found"
+              else
+                echo "❌ Failed to delete $TAG (HTTP $RESPONSE)"
+              fi
             fi
           done
-        

.gitignore

@@ -171,4 +171,7 @@ ips_blocked.json
 
 firewall-events.json
 .DS_Store
-DS_Store
+DS_Store
+
+.build
+.secrets