From 6c8c43e0e63e3a3a615059fd1000945387ff1a84 Mon Sep 17 00:00:00 2001 From: Marcus Date: Sat, 31 Jan 2026 15:03:47 -0300 Subject: [PATCH] ajustes novos --- .forgejo/workflows/deploy.yaml | 74 ++++++++++------------------------ 1 file changed, 22 insertions(+), 52 deletions(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 36e2420..79e182b 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -9,58 +9,43 @@ on: env: REGISTRY: pipe.gohorsejobs.com IMAGE_NAMESPACE: bohessefm - DOCKER_MTU: 1200 + # O DOCKER_HOST aponta para o seu container sidecar 'docker' no mesmo pod + DOCKER_HOST: tcp://localhost:2375 jobs: build-and-push: + # As labels aqui batem com o que você registrou no seu Deployment runs-on: - - self-hosted - ubuntu-latest - container: - image: docker:24.0.7-dind - options: --privileged - env: - # Forçamos o uso do localhost para evitar erros de DNS/Lookup - DOCKER_HOST: tcp://localhost:2375 - DOCKER_TLS_CERTDIR: "" + defaults: + run: + shell: sh steps: - - name: Prepare Environment (MTU & Git & Docker Daemon) - run: | - # 1. Ajuste de Rede - ip link set dev eth0 mtu ${{ env.DOCKER_MTU }} || true - apk add --no-cache git - - # 2. Inicia o Docker Daemon em background dentro do próprio container - # Isso garante que 'localhost:2375' funcione sem depender de DNS externo - nohup dockerd --host=tcp://localhost:2375 --host=unix:///var/run/docker.sock --mtu=${{ env.DOCKER_MTU }} & - - # 3. Espera o Docker subir (retry loop) - timeout 30s sh -c 'until docker info >/dev/null 2>&1; do echo "Aguardando Docker..."; sleep 2; done' - + # 1. Agora o Checkout funciona direto porque a imagem 'node:20-bookworm' tem Node! - name: Checkout code - run: | - git config --global core.compression 0 - git clone --depth 1 --branch dev https://${{ secrets.FORGEJO_TOKEN }}@pipe.gohorsejobs.com/${{ github.repository }}.git . + uses: actions/checkout@v4 - - name: Docker Login (Forgejo) + # 2. Garante que o Daemon do sidecar já acordou + - name: Wait for Docker + run: | + until docker info >/dev/null 2>&1; do echo "Aguardando Docker..."; sleep 1; done + + - name: Docker login run: | - # Autenticação usando o Token do Forgejo echo "${{ secrets.FORGEJO_TOKEN }}" | docker login ${{ env.REGISTRY }} \ -u ${{ env.IMAGE_NAMESPACE }} --password-stdin - name: Build & Push Backend run: | - docker build --build-arg DOCKER_MTU=${{ env.DOCKER_MTU }} \ - -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/gohorsejobs:${{ github.sha }} \ + 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 - name: Build & Push Backoffice run: | - docker build --build-arg DOCKER_MTU=${{ env.DOCKER_MTU }} \ - -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/backoffice:${{ github.sha }} \ + 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 @@ -68,30 +53,16 @@ jobs: deploy-to-k3s: needs: build-and-push runs-on: - - self-hosted - ubuntu-latest - container: - image: alpine/k8s:1.30.0 steps: - - name: Fix Network & Install Git - run: | - ip link set dev eth0 mtu ${{ env.DOCKER_MTU }} || true - apk add --no-cache git - - name: Checkout code - run: | - git clone --depth 1 --branch dev https://${{ secrets.FORGEJO_TOKEN }}@pipe.gohorsejobs.com/${{ github.repository }}.git . + uses: actions/checkout@v4 - - name: Apply to K3s + - name: Deploy to K3s run: | - mkdir -p $HOME/.kube - echo "${{ secrets.KUBECONFIG }}" > $HOME/.kube/config - chmod 600 $HOME/.kube/config - export KUBECONFIG=$HOME/.kube/config - + # O kubectl já funciona porque o ServiceAccount 'forgejo-deployer' é admin kubectl create namespace gohorsejobsdev --dry-run=client -o yaml | kubectl apply -f - - # Garante que o secret de pull de imagem no K3s use o Registry correto kubectl -n gohorsejobsdev create secret docker-registry forgejo-registry \ --docker-server=${{ env.REGISTRY }} \ --docker-username=${{ env.IMAGE_NAMESPACE }} \ @@ -99,7 +70,6 @@ jobs: --dry-run=client -o yaml | kubectl apply -f - kubectl -n gohorsejobsdev create secret generic backend-secrets \ - --from-literal=MTU="${{ env.DOCKER_MTU }}" \ --from-literal=JWT_SECRET="${{ vars.JWT_SECRET }}" \ --from-literal=AMQP_URL="${{ vars.AMQP_URL }}" \ --from-literal=DATABASE_URL="${{ vars.DATABASE_URL }}" \ @@ -109,8 +79,8 @@ jobs: 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 }} - - kubectl -n gohorsejobsdev rollout status deployment/gohorse-backend-dev --timeout=120s - kubectl -n gohorsejobsdev rollout status deployment/gohorse-backoffice-dev --timeout=120s \ No newline at end of file + + kubectl -n gohorsejobsdev rollout status deployment/gohorse-backend-dev --timeout=60s \ No newline at end of file