override file added to keep docker desktop option available

Author: HasanJaved-Developer

.github/workflows/docker-compose-ci.yml

@@ -1,17 +1,17 @@
-# .github/workflows/docker-compose-ci.yml
 name: Build & Push (Compose/Bake)
 
 on:
   push:
     branches: [ "main", "master" ]
-  # enable when you want release builds from tags
-  # push:
-  #   tags: [ "v*" ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
+    env:
+      # Your Docker Hub namespace (must be lowercase)
+      DOCKERHUB_NS: ${{ secrets.DOCKERHUB_USERNAME }}
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -34,20 +34,31 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      # Optional: quick sanity check that compose is at repo root
-      - name: Show tree
+      - name: Compute short SHA
+        id: sha
+        run: echo "short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+
+      - name: Ensure compose files exist
         run: |
-          pwd
-          ls -la
-          test -f docker-compose.yml && echo "compose found" || (echo "compose missing" && exit 1)
+          test -f docker-compose.yml || (echo "missing docker-compose.yml" && exit 1)
+          test -f docker-compose.ci.override.yml || (echo "missing docker-compose.ci.override.yml" && exit 1)
 
-      - name: Build & Push with Bake (compose)
-        uses: docker/bake-action@v4
+      - name: Build & Push with Bake (compose + override)
+        uses: docker/bake-action@v5
         with:
           files: |
             docker-compose.yml
+            docker-compose.ci.override.yml
           push: true
-          # You can override or add tags/labels per-target with `set:` if needed
-          # set: |
-          #   *.labels=org.opencontainers.image.source=${{ github.server_url }}/${{ github.repository }}
-          #   *.tags=ghcr.io/hasanjaved-developer/centralized-logging/{{.target}}:edge
+          # Add extra tags for GHCR (sha) and Docker Hub (edge + sha)
+          set: |
+            *.labels=org.opencontainers.image.revision=${{ github.sha }}
+            usermanagementapi.tags=${{ env.DOCKERHUB_NS }}/centralized-logging/usermanagementapi:edge
+            usermanagementapi.tags=${{ env.DOCKERHUB_NS }}/centralized-logging/usermanagementapi:${{ steps.sha.outputs.short }}
+            centralizedloggingapi.tags=${{ env.DOCKERHUB_NS }}/centralized-logging/loggingapi:edge
+            centralizedloggingapi.tags=${{ env.DOCKERHUB_NS }}/centralized-logging/loggingapi:${{ steps.sha.outputs.short }}
+            apiintegrationmvc.tags=${{ env.DOCKERHUB_NS }}/centralized-logging/integrationportal:edge
+            apiintegrationmvc.tags=${{ env.DOCKERHUB_NS }}/centralized-logging/integrationportal:${{ steps.sha.outputs.short }}
+        env:
+          # Primary tag selected in the override (GHCR)
+          TAG: edge

docker-compose.ci.override.yml

@@ -0,0 +1,9 @@
+services:
+  userapi:
+    image: ghcr.io/hasanjaved-developer/centralized-logging/usermanagementapi:${TAG:-edge}
+
+  api:
+    image: ghcr.io/hasanjaved-developer/centralized-logging/loggingapi:${TAG:-edge}
+
+  web:
+    image: ghcr.io/hasanjaved-developer/centralized-logging/integrationportal:${TAG:-edge}