ajustes

.forgejo/workflows/deploy.yaml

@@ -6,31 +6,29 @@ on:
     branches:
       - dev
 
+env:
+  REGISTRY: pipe.gohorsejobs.com
+  IMAGE_NAMESPACE: bohessefm
+
 jobs:
   build-and-push:
     runs-on: docker-ready
-    env:
-      REGISTRY: pipe.gohorsejobs.com
-    steps:
-      - name: Install Dependencies
-        run: |
-          sed -i 's/dl-cdn.alpinelinux.org/mirror.leaseweb.com/g' /etc/apk/repositories
-          apk add --no-cache git docker-cli docker-cli-buildx
 
+    steps:
       - name: Checkout code
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 1 
 
-      # Autenticação Definitiva (Gera o config.json da forma correta)
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Login to Forgejo Registry
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
-          username: bohessefm
+          username: ${{ env.IMAGE_NAMESPACE }}
           password: ${{ secrets.FORGEJO_TOKEN }}
 
-      # Build e Push do Backend (O push: true aqui é muito mais estável que o comando manual)
+      # Backend
       - name: Build and Push Backend
         uses: docker/build-push-action@v5
         with:
@@ -39,10 +37,10 @@ jobs:
           push: true
           provenance: false
           tags: |
-            ${{ env.REGISTRY }}/bohessefm/gohorsejobs:${{ github.sha }}
-            ${{ env.REGISTRY }}/bohessefm/gohorsejobs:latest
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/gohorsejobs:${{ github.sha }}
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/gohorsejobs:latest
 
-      # Build e Push do Backoffice
+      # Backoffice
       - name: Build and Push Backoffice
         uses: docker/build-push-action@v5
         with:
@@ -51,18 +49,20 @@ jobs:
           push: true
           provenance: false
           tags: |
-            ${{ env.REGISTRY }}/bohessefm/backoffice:${{ github.sha }}
-            ${{ env.REGISTRY }}/bohessefm/backoffice:latest
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/backoffice:${{ github.sha }}
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/backoffice:latest
 
   deploy-to-k3s:
     needs: build-and-push
     runs-on: docker-ready
+
     steps:
-      - name: Install Kubectl
+      - name: Install kubectl
         run: |
           apk add --no-cache curl
           K8S_VERSION=$(curl -L -s https://dl.k8s.io/release/stable.txt)
-          curl -L -o /usr/local/bin/kubectl "https://dl.k8s.io/release/${K8S_VERSION}/bin/linux/amd64/kubectl"
+          curl -L -o /usr/local/bin/kubectl \
+            https://dl.k8s.io/release/${K8S_VERSION}/bin/linux/amd64/kubectl
           chmod +x /usr/local/bin/kubectl
 
       - name: Checkout code
@@ -75,17 +75,14 @@ jobs:
           chmod 600 $HOME/.kube/config
           export KUBECONFIG=$HOME/.kube/config
 
-          # Namespace
           kubectl create namespace gohorsejobsdev --dry-run=client -o yaml | kubectl apply -f -
 
-          # Registry Secret (Usando aspas duplas para evitar erro de parse)
           kubectl -n gohorsejobsdev delete secret forgejo-registry --ignore-not-found
           kubectl -n gohorsejobsdev create secret docker-registry forgejo-registry \
-            --docker-server="${{ env.REGISTRY }}" \
-            --docker-username="bohessefm" \
+            --docker-server=${{ env.REGISTRY }} \
+            --docker-username=${{ env.IMAGE_NAMESPACE }} \
             --docker-password="${{ secrets.FORGEJO_TOKEN }}"
 
-          # Backend Secrets
           kubectl -n gohorsejobsdev delete secret backend-secrets --ignore-not-found
           kubectl -n gohorsejobsdev create secret generic backend-secrets \
             --from-literal=MTU="${{ vars.MTU }}" \
@@ -93,13 +90,15 @@ jobs:
             --from-literal=AMQP_URL="${{ vars.AMQP_URL }}" \
             --from-literal=DATABASE_URL="${{ vars.DATABASE_URL }}"
 
-          # Aplicar Manifestos
           kubectl apply -f k8s/dev/ -n gohorsejobsdev
 
-          # Update Images com SHA para garantir o rollout
-          kubectl -n gohorsejobsdev set image deployment/gohorse-backend-dev backend=pipe.gohorsejobs.com/bohessefm/gohorsejobs:${{ github.sha }}
-          kubectl -n gohorsejobsdev set image deployment/gohorse-backoffice-dev backoffice=pipe.gohorsejobs.com/bohessefm/backoffice:${{ github.sha }}
+          kubectl -n gohorsejobsdev set image deployment/gohorse-backend-dev \
+            backend=${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/gohorsejobs:${{ github.sha }}
 
-          # Restart forçado
-          kubectl delete pod -n gohorsejobsdev -l app=gohorse-backend-dev --force --grace-period=0 || true
-          kubectl delete pod -n gohorsejobsdev -l app=gohorse-backoffice-dev --force --grace-period=0 || true
+          kubectl -n gohorsejobsdev set image deployment/gohorse-backoffice-dev \
+            backoffice=${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/backoffice:${{ github.sha }}
+
+          kubectl -n gohorsejobsdev rollout restart deployment/gohorse-backend-dev
+          kubectl -n gohorsejobsdev rollout restart deployment/gohorse-backoffice-dev
+
+          echo "🚀 Deploy finalizado com sucesso!"