Updated CI to publish-images on push to default branch.

.gitea/workflows/ci.yml

@@ -48,7 +48,8 @@ jobs:
       - run: dotnet test  --configuration Release --no-build --logger "trx;LogFileName=test-results.trx"
       
   publish-image:
-      if: ${{ false }}   # disabled for now
+      if: github.ref == format('refs/heads/{0}', github.event.repository.default_branch)
+      needs: build-test
       runs-on: [self-hosted, linux, x64, docker]
       container:
           image: ghcr.io/catthehacker/ubuntu:act-latest
@@ -56,19 +57,20 @@ jobs:
             --privileged
       env:
         REGISTRY: ${{ secrets.REGISTRY_HOST }}
-        OWNER_REPO: ${{ github.repository }}
-        DOCKERFILE: JSMR.Api/Dockerfile
-        CONTEXT: .
       steps:
     - uses: actions/checkout@v4
 
-        - name: Normalize image name (lowercase)
-          id: names
+    - name: Set image variables
+      id: vars
+      shell: bash
       run: |
-            IMAGE_LC="$(echo "${REGISTRY}/${OWNER_REPO}" | tr '[:upper:]' '[:lower:]')"
-            echo "image=${IMAGE_LC}" >> "$GITHUB_OUTPUT"
+        OWNER_LC="$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')"
+        SHA_SHORT="$(echo "${{ github.sha }}" | cut -c1-7)"
+        echo "owner_lc=$OWNER_LC" >> "$GITHUB_OUTPUT"
+        echo "sha_short=$SHA_SHORT" >> "$GITHUB_OUTPUT"
 
     - name: Docker login
+      shell: bash
       run: |
         echo "${{ secrets.REGISTRY_PASSWORD }}" \
         | docker login "${{ env.REGISTRY }}" \
@@ -78,11 +80,32 @@ jobs:
     - name: Enable BuildKit
       run: echo "DOCKER_BUILDKIT=1" >> $GITHUB_ENV
 
-        - name: Build
-          run: docker build -f "$DOCKERFILE" -t "${{ steps.names.outputs.image }}:${{ github.sha }}" "$CONTEXT"
-
-        - name: Push
+    - name: Build API image
+      shell: bash
       run: |
-            docker push "${{ steps.names.outputs.image }}:${{ github.sha }}"
-            docker tag "${{ steps.names.outputs.image }}:${{ github.sha }}" "${{ steps.names.outputs.image }}:latest"
-            docker push "${{ steps.names.outputs.image }}:latest"
+        docker build \
+          -f JSMR.Api/Dockerfile \
+          -t "${{ env.REGISTRY }}/${{ steps.vars.outputs.owner_lc }}/jsmr-api:${{ steps.vars.outputs.sha_short }}" \
+          -t "${{ env.REGISTRY }}/${{ steps.vars.outputs.owner_lc }}/jsmr-api:main" \
+          .
+
+    - name: Push API image
+      shell: bash
+      run: |
+        docker push "${{ env.REGISTRY }}/${{ steps.vars.outputs.owner_lc }}/jsmr-api:${{ steps.vars.outputs.sha_short }}"
+        docker push "${{ env.REGISTRY }}/${{ steps.vars.outputs.owner_lc }}/jsmr-api:main"
+
+    - name: Build Web image
+      shell: bash
+      run: |
+        docker build \
+          -f JSMR.UI.Blazor/Dockerfile \
+          -t "${{ env.REGISTRY }}/${{ steps.vars.outputs.owner_lc }}/jsmr-web:${{ steps.vars.outputs.sha_short }}" \
+          -t "${{ env.REGISTRY }}/${{ steps.vars.outputs.owner_lc }}/jsmr-web:main" \
+          .
+
+    - name: Push Web image
+      shell: bash
+      run: |
+        docker push "${{ env.REGISTRY }}/${{ steps.vars.outputs.owner_lc }}/jsmr-web:${{ steps.vars.outputs.sha_short }}"
+        docker push "${{ env.REGISTRY }}/${{ steps.vars.outputs.owner_lc }}/jsmr-web:main"