ajustes novos

.forgejo/workflows/deploy.yaml

@@ -8,8 +8,6 @@ on:
 env:
   REGISTRY: pipe.gohorsejobs.com
   IMAGE_NAMESPACE: bohessefm
-  DOCKER_HOST: unix:///run/docker.sock
-  DOCKER_BUILDKIT: 0
 
 jobs:
   build-and-push:
@@ -27,70 +25,68 @@ jobs:
         run: |
           docker build -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/gohorsejobs:${{ github.sha }} \
             -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/gohorsejobs:latest ./backend
-          docker push --quiet ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/gohorsejobs:latest
+          docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/gohorsejobs:latest
 
       - name: Build & Push Backoffice
         run: |
           docker build -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/backoffice:${{ github.sha }} \
             -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/backoffice:latest ./backoffice
-          docker push --quiet ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/backoffice:latest
+          docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/backoffice:latest
 
   deploy:
     needs: build-and-push
     runs-on: [self-hosted, linux-amd64]
     steps:
-      - name: Install Deploy Tools
+      - name: Install kubectl
         run: |
-          apk add --no-cache curl ca-certificates
+          apk add --no-cache curl
           curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
           chmod +x kubectl
           mv kubectl /usr/local/bin/
 
-      - name: Checkout code
-        uses: actions/checkout@v4
-
       - name: Configure Kubeconfig
         run: |
           mkdir -p ~/.kube
           echo "${{ secrets.KUBE_CONFIG }}" > ~/.kube/config
           chmod 600 ~/.kube/config
 
-      - name: Sync Environment and Secrets
+      - name: Sync Secrets and Vars
         run: |
           kubectl create namespace gohorsejobsdev --dry-run=client -o yaml | kubectl apply -f -
-          
+
-          # 1. Sincroniza o Registry Secret
+          # 1. Recria o Secret de Pull (Isso resolve o ImagePullBackOff)
           kubectl get secret forgejo-registry-secret --namespace=forgejo -o yaml | \
           sed 's/namespace: forgejo/namespace: gohorsejobsdev/' | \
-          kubectl apply -f - || echo "Aviso: Falha ao sincronizar registry secret"
+          kubectl apply -f -
 
-          # 2. Cria/Atualiza o Secret de Variáveis (backend-secrets)
+          # 2. Cria o Secret com TODAS as variáveis do print
-          # Aqui injetamos todas as variáveis que aparecem no seu print
           kubectl create secret generic backend-secrets -n gohorsejobsdev \
             --from-literal=MTU="${{ vars.MTU }}" \
             --from-literal=DATABASE_URL="${{ vars.DATABASE_URL }}" \
             --from-literal=AMQP_URL="${{ vars.AMQP_URL }}" \
             --from-literal=JWT_SECRET="${{ vars.JWT_SECRET }}" \
             --from-literal=JWT_EXPIRATION="${{ vars.JWT_EXPIRATION }}" \
+            --from-literal=PASSWORD_PEPPER="${{ vars.PASSWORD_PEPPER }}" \
             --from-literal=COOKIE_SECRET="${{ vars.COOKIE_SECRET }}" \
+            --from-literal=COOKIE_DOMAIN="${{ vars.COOKIE_DOMAIN }}" \
             --from-literal=BACKEND_PORT="${{ vars.BACKEND_PORT }}" \
             --from-literal=BACKEND_HOST="${{ vars.BACKEND_HOST }}" \
             --from-literal=ENV="${{ vars.ENV }}" \
+            --from-literal=CORS_ORIGINS="${{ vars.CORS_ORIGINS }}" \
+            --from-literal=S3_BUCKET="${{ vars.S3_BUCKET }}" \
+            --from-literal=AWS_REGION="${{ vars.AWS_REGION }}" \
+            --from-literal=AWS_ENDPOINT="${{ vars.AWS_ENDPOINT }}" \
+            --from-literal=AWS_ACCESS_KEY_ID="${{ vars.AWS_ACCESS_KEY_ID }}" \
+            --from-literal=AWS_SECRET_ACCESS_KEY="${{ vars.AWS_SECRET_ACCESS_KEY }}" \
             --dry-run=client -o yaml | kubectl apply -f -
 
       - name: Deploy to K3s
         run: |
           kubectl apply -f k8s/dev/ -n gohorsejobsdev
-
-          # Atualiza as imagens para o novo commit
-          kubectl -n gohorsejobsdev set image deployment/gohorse-backend-dev \
-            backend=${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/gohorsejobs:${{ github.sha }}
           
-          kubectl -n gohorsejobsdev set image deployment/gohorse-backoffice-dev \
+          # Força o uso da imagem nova e restart dos pods
-            backoffice=${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/backoffice:${{ github.sha }}
+          kubectl -n gohorsejobsdev set image deployment/gohorse-backend-dev backend=${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/gohorsejobs:latest
+          kubectl -n gohorsejobsdev set image deployment/gohorse-backoffice-dev backoffice=${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/backoffice:latest
           
-          # Força o restart para garantir que leiam as variáveis novas do Secret
           kubectl -n gohorsejobsdev rollout restart deployment/gohorse-backend-dev
-          kubectl -n gohorsejobsdev rollout restart deployment/gohorse-backoffice-dev
+          kubectl -n gohorsejobsdev rollout restart deployment/gohorse-backoffice-dev
-          
-          kubectl -n gohorsejobsdev rollout status deployment/gohorse-backend-dev --timeout=120s