From 3f22628bf41b50fdaee47fbf84fba01215386dfa Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 23 Dec 2025 22:33:05 +0000 Subject: [PATCH] fix: correct dockerfile path and registry --- .gitea/workflows/prod-deploy.yml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/prod-deploy.yml b/.gitea/workflows/prod-deploy.yml index ae84542..31bd4e3 100644 --- a/.gitea/workflows/prod-deploy.yml +++ b/.gitea/workflows/prod-deploy.yml @@ -6,7 +6,8 @@ on: - production env: - REGISTRY: git.foursat.afrino.co + REGISTRY: gitea-svc:3000 + EXTERNAL_REGISTRY: git.foursat.afrino.co IMAGE_NAME: admin/frontoffice-bff jobs: @@ -18,7 +19,7 @@ jobs: env: HTTP_PROXY: http://proxyuser:87zH26nbqT2@46.249.98.211:3128 HTTPS_PROXY: http://proxyuser:87zH26nbqT2@46.249.98.211:3128 - NO_PROXY: localhost,127.0.0.1,gitea-svc,45.149.79.127,10.0.0.0/8 + NO_PROXY: localhost,127.0.0.1,gitea-svc,45.149.79.127,194.5.195.53,10.0.0.0/8 steps: - name: Install dependencies run: | @@ -42,7 +43,7 @@ jobs: "default": { "httpProxy": "http://proxyuser:87zH26nbqT2@46.249.98.211:3128", "httpsProxy": "http://proxyuser:87zH26nbqT2@46.249.98.211:3128", - "noProxy": "localhost,127.0.0.1,gitea-svc,45.149.79.127,10.0.0.0/8" + "noProxy": "localhost,127.0.0.1,gitea-svc,194.5.195.53,10.0.0.0/8" } } } @@ -57,21 +58,26 @@ jobs: - name: Build Docker Image run: | - docker build -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }} \ + cd src + docker build -f FrontOffice.BFF.WebApi/Dockerfile \ + -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }} \ -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:prod \ + -t ${{ env.EXTERNAL_REGISTRY }}/${{ env.IMAGE_NAME }}:prod \ --build-arg HTTP_PROXY=http://proxyuser:87zH26nbqT2@46.249.98.211:3128 \ --build-arg HTTPS_PROXY=http://proxyuser:87zH26nbqT2@46.249.98.211:3128 \ . - name: Push to Registry run: | - echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login ${{ env.REGISTRY }} -u admin --password-stdin + echo "87zH26nbqT" | docker login ${{ env.REGISTRY }} -u admin --password-stdin docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }} docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:prod + echo "87zH26nbqT" | docker login ${{ env.EXTERNAL_REGISTRY }} -u admin --password-stdin + docker push ${{ env.EXTERNAL_REGISTRY }}/${{ env.IMAGE_NAME }}:prod - name: Deploy to Production run: | mkdir -p ~/.kube echo "${{ secrets.KUBECONFIG_PROD }}" | base64 -d > ~/.kube/config - kubectl rollout restart deployment/frontoffice-bff || echo "Deployment doesn't exist yet" - kubectl rollout status deployment/frontoffice-bff --timeout=5m || echo "Deployment rollout pending" + kubectl rollout restart deployment/frontoffice-bff || echo "Deployment not found" + kubectl rollout status deployment/frontoffice-bff --timeout=5m || echo "Rollout pending"