From bf1bf808f401dd4fb60ed6d9b660a519da8c7616 Mon Sep 17 00:00:00 2001 From: Marcus Date: Sat, 31 Jan 2026 15:18:08 -0300 Subject: [PATCH] ajustes novos --- .forgejo/workflows/deploy.yaml | 40 ++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 3960646..44fe45a 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -8,11 +8,17 @@ on: env: REGISTRY: pipe.gohorsejobs.com IMAGE_NAMESPACE: bohessefm - DOCKER_HOST: unix:///run/docker.sock # ESSENCIAL: Bate com o volume montado + # Usa o socket compartilhado via volume no Pod do K3s + DOCKER_HOST: unix:///run/docker.sock jobs: build-and-push: - runs-on: [ubuntu-latest] + # AJUSTE: Use as labels EXATAS do Runner ID 49 para ele "pescar" o job + runs-on: [self-hosted, linux-amd64] + defaults: + run: + shell: sh + steps: - name: Install Tools run: apk add --no-cache git docker-cli @@ -25,19 +31,35 @@ jobs: echo "${{ secrets.FORGEJO_TOKEN }}" | docker login ${{ env.REGISTRY }} \ -u ${{ env.IMAGE_NAMESPACE }} --password-stdin - - name: Build & Push + - name: Build & Push Backend run: | - docker build -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/gohorsejobs:latest ./backend + docker build -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 - - docker build -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/backoffice:latest ./backoffice + + - 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 ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/backoffice:${{ github.sha }} docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/backoffice:latest deploy: needs: build-and-push - runs-on: [ubuntu-latest] + runs-on: [self-hosted, linux-amd64] steps: - name: Deploy to K3s run: | - # O kubectl já está no ServiceAccount. Aplique seus manifestos aqui. - kubectl apply -f k8s/dev/ -n gohorsejobsdev \ No newline at end of file + # Como o Runner tem ClusterRole de admin, o kubectl funciona nativamente + kubectl create namespace gohorsejobsdev --dry-run=client -o yaml | kubectl apply -f - + + # Garante que os manifests do diretório sejam aplicados + kubectl apply -f k8s/dev/ -n gohorsejobsdev + + # Update das imagens para a versão específica do 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 \ + backoffice=${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/backoffice:${{ github.sha }} \ No newline at end of file