.gitea/workflows/ci-build.yml

@@ -69,6 +69,9 @@ jobs:
           if [ -n "${server_host}" ] && ! printf '%s' "${registry_host}" | grep -qi "${server_host}"; then
             echo "::warning::REGISTRY_URL (${REGISTRY_URL}) does not match current Gitea host (${server_host}). Ensure this registry endpoint is managed by Gitea." >&2
           fi
+          registry_repository="${registry_host}/allucanget/${REGISTRY_CONTAINER_NAME}"
+          echo "REGISTRY_HOST=${registry_host}" >> "$GITHUB_ENV"
+          echo "REGISTRY_REPOSITORY=${registry_repository}" >> "$GITHUB_ENV"
 
       - name: Set up QEMU and Buildx
         uses: docker/setup-buildx-action@v3
@@ -76,27 +79,26 @@ jobs:
       - name: Log in to gitea registry
         if: ${{ steps.meta.outputs.allow_push == 'true' }}
         uses: docker/login-action@v3
-        continue-on-error: true
         with:
-          registry: ${{ env.REGISTRY_URL }}
+          registry: ${{ env.REGISTRY_HOST }}
           username: ${{ env.REGISTRY_USERNAME }}
           password: ${{ env.REGISTRY_PASSWORD }}
 
       - name: Build image
         id: build-image
         env:
-          REGISTRY_URL: ${{ env.REGISTRY_URL }}
+          REGISTRY_REPOSITORY: ${{ env.REGISTRY_REPOSITORY }}
           REGISTRY_CONTAINER_NAME: ${{ env.REGISTRY_CONTAINER_NAME }}
           SHA_TAG: ${{ steps.meta.outputs.sha }}
-          PUSH_IMAGE: ${{ steps.meta.outputs.allow_push == 'true' && env.REGISTRY_URL != '' && env.REGISTRY_USERNAME != '' && env.REGISTRY_PASSWORD != '' }}
+          PUSH_IMAGE: ${{ steps.meta.outputs.allow_push == 'true' && env.REGISTRY_HOST != '' && env.REGISTRY_USERNAME != '' && env.REGISTRY_PASSWORD != '' }}
         run: |
           set -eo pipefail
           LOG_FILE=build.log
           if [ "${PUSH_IMAGE}" = "true" ]; then
             docker buildx build \
-              --push \
-              --tag "${REGISTRY_URL}/allucanget/${REGISTRY_CONTAINER_NAME}:latest" \
-              --tag "${REGISTRY_URL}/allucanget/${REGISTRY_CONTAINER_NAME}:${SHA_TAG}" \
+              --load \
+              --tag "${REGISTRY_REPOSITORY}:latest" \
+              --tag "${REGISTRY_REPOSITORY}:${SHA_TAG}" \
               --file Dockerfile \
               . 2>&1 | tee "${LOG_FILE}"
           else
@@ -107,6 +109,20 @@ jobs:
               . 2>&1 | tee "${LOG_FILE}"
           fi
 
+      - name: Push image
+        if: ${{ steps.meta.outputs.allow_push == 'true' }}
+        env:
+          REGISTRY_REPOSITORY: ${{ env.REGISTRY_REPOSITORY }}
+          SHA_TAG: ${{ steps.meta.outputs.sha }}
+        run: |
+          set -euo pipefail
+          if [ -z "${REGISTRY_REPOSITORY}" ]; then
+            echo "::error::REGISTRY_REPOSITORY not defined; cannot push image" >&2
+            exit 1
+          fi
+          docker push "${REGISTRY_REPOSITORY}:${SHA_TAG}"
+          docker push "${REGISTRY_REPOSITORY}:latest"
+
       - name: Upload docker build logs
         if: failure()
         uses: actions/upload-artifact@v4
@@ -128,6 +144,21 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Resolve registry repository
+        run: |
+          set -euo pipefail
+          if [ -z "${REGISTRY_URL}" ]; then
+            echo "::error::REGISTRY_URL secret not configured. Configure it with your Gitea container registry host." >&2
+            exit 1
+          fi
+          registry_host="${REGISTRY_URL#http://}"
+          registry_host="${registry_host#https://}"
+          registry_host="${registry_host%%/*}"
+          registry_host="${registry_host%%:*}"
+          registry_repository="${registry_host}/allucanget/${REGISTRY_CONTAINER_NAME}"
+          echo "REGISTRY_HOST=${registry_host}" >> "$GITHUB_ENV"
+          echo "REGISTRY_REPOSITORY=${registry_repository}" >> "$GITHUB_ENV"
+
       - name: Capture commit metadata
         id: commit_meta
         run: |
@@ -152,7 +183,7 @@ jobs:
       - name: Deploy to staging
         if: contains(steps.commit_meta.outputs.message, '[deploy staging]')
         run: |
-          kubectl set image deployment/calminer-app calminer=${REGISTRY_URL}/allucanget/${REGISTRY_CONTAINER_NAME}:latest
+          kubectl set image deployment/calminer-app calminer=${REGISTRY_REPOSITORY}:latest
           kubectl apply -f k8s/configmap.yaml
           kubectl apply -f k8s/secret.yaml
           kubectl rollout status deployment/calminer-app
@@ -168,7 +199,7 @@ jobs:
       - name: Deploy to production
         if: contains(steps.commit_meta.outputs.message, '[deploy production]')
         run: |
-          kubectl set image deployment/calminer-app calminer=${REGISTRY_URL}/allucanget/${REGISTRY_CONTAINER_NAME}:latest
+          kubectl set image deployment/calminer-app calminer=${REGISTRY_REPOSITORY}:latest
           kubectl apply -f k8s/configmap.yaml
           kubectl apply -f k8s/secret.yaml
           kubectl rollout status deployment/calminer-app

docker-compose.prod.yml

@@ -2,11 +2,7 @@ version: "3.8"
 
 services:
   app:
-    build:
-      context: .
-      dockerfile: Dockerfile
-      args:
-        APT_CACHE_URL: ${APT_CACHE_URL:-}
+    image: git.allucanget.biz/allucanget/calminer:latest
     environment:
       - ENVIRONMENT=production
       - DEBUG=false