ajustes novos

.forgejo/workflows/deploy.yaml

@@ -16,23 +16,18 @@ jobs:
     runs-on:
       - self-hosted
       - ubuntu-latest
-    defaults:
+    # USANDO A IMAGEM OFICIAL DO DOCKER (Leve e nativa)
-      run:
+    container:
-        shell: sh
+      image: docker:24.0.7-dind
-
+      options: --privileged # Necessário para Docker-in-Docker ou acesso ao socket
+    
     steps:
-      - name: Prepare Environment (Git & Docker)
+      # Instala o Git rapidinho porque a imagem 'docker' é Alpine e vem sem ele
-        run: |
+      - name: Install Git
-          # Detecta o gerenciador de pacotes e instala o Git
+        run: apk add --no-cache git
-          if command -v apk >/dev/null 2>&1; then
-            apk add --no-cache git
-          elif command -v apt-get >/dev/null 2>&1; then
-            apt-get update && apt-get install -y git
-          fi
 
       - name: Checkout code
         run: |
-          # Clone manual usando o token para evitar erro de Node.js
           git clone --depth 1 --branch dev https://${{ secrets.FORGEJO_TOKEN }}@pipe.gohorsejobs.com/${{ github.repository }}.git .
 
       - name: Docker Login
@@ -46,7 +41,6 @@ jobs:
             -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/gohorsejobs:${{ github.sha }} \
             -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/gohorsejobs:latest ./backend
           docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/gohorsejobs:${{ github.sha }}
-          docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/gohorsejobs:latest
 
       - name: Build & Push Backoffice
         run: |
@@ -54,50 +48,38 @@ jobs:
             -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/backoffice:${{ github.sha }} \
             -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/backoffice:latest ./backoffice
           docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/backoffice:${{ github.sha }}
-          docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/backoffice:latest
 
   deploy-to-k3s:
     needs: build-and-push
     runs-on:
       - self-hosted
       - ubuntu-latest
+    container:
+      image: alpine/k8s:1.30.0
     steps:
-      - name: Prepare Environment (Git & Wget)
+      - name: Install Git
-        run: |
+        run: apk add --no-cache git
-          if command -v apk >/dev/null 2>&1; then
-            apk add --no-cache git wget
-          elif command -v apt-get >/dev/null 2>&1; then
-            apt-get update && apt-get install -y git wget
-          fi
 
       - name: Checkout code
         run: |
           git clone --depth 1 --branch dev https://${{ secrets.FORGEJO_TOKEN }}@pipe.gohorsejobs.com/${{ github.repository }}.git .
 
-      - name: Setup Kubectl
-        run: |
-          if ! command -v kubectl >/dev/null 2>&1; then
-            wget -qO /usr/local/bin/kubectl https://dl.k8s.io/release/v1.30.0/bin/linux/amd64/kubectl
-            chmod +x /usr/local/bin/kubectl
-          fi
-
       - name: Apply to K3s
         run: |
           mkdir -p $HOME/.kube
           echo "${{ secrets.KUBECONFIG }}" > $HOME/.kube/config
           chmod 600 $HOME/.kube/config
           
-          # 1. Namespace
+          # Namespace
           kubectl create namespace gohorsejobsdev --dry-run=client -o yaml | kubectl apply -f -
 
-          # 2. Registry Secret (Idempotente)
+          # Secrets (Update if exists)
           kubectl -n gohorsejobsdev create secret docker-registry forgejo-registry \
             --docker-server=${{ env.REGISTRY }} \
             --docker-username=${{ env.IMAGE_NAMESPACE }} \
             --docker-password="${{ secrets.FORGEJO_TOKEN }}" \
             --dry-run=client -o yaml | kubectl apply -f -
 
-          # 3. App Secrets (Idempotente)
           kubectl -n gohorsejobsdev create secret generic backend-secrets \
             --from-literal=MTU="${{ env.DOCKER_MTU }}" \
             --from-literal=JWT_SECRET="${{ vars.JWT_SECRET }}" \
@@ -105,16 +87,11 @@ jobs:
             --from-literal=DATABASE_URL="${{ vars.DATABASE_URL }}" \
             --dry-run=client -o yaml | kubectl apply -f -
 
-          # 4. Deploy Manifests
+          # Deploy
           kubectl apply -f k8s/dev/ -n gohorsejobsdev
 
-          # 5. Update Images (Trigger Rolling Update)
+          # Rollout
           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 \
-            backoffice=${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/backoffice:${{ github.sha }}
+            backoffice=${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/backoffice:${{ github.sha }}
-
-          # 6. Wait for Rollout
-          kubectl -n gohorsejobsdev rollout status deployment/gohorse-backend-dev --timeout=60s
-          kubectl -n gohorsejobsdev rollout status deployment/gohorse-backoffice-dev --timeout=60s