From 0a7b7ba6dd067b0594380bea37d0f197b1e14a0d Mon Sep 17 00:00:00 2001 From: Marcus Date: Sat, 31 Jan 2026 14:59:07 -0300 Subject: [PATCH] ajustes novos --- .forgejo/workflows/deploy.yaml | 41 +++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 82acea5..2ec66c5 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -16,18 +16,28 @@ jobs: runs-on: - self-hosted - ubuntu-latest - # USANDO A IMAGEM OFICIAL DO DOCKER (Leve e nativa) container: image: docker:24.0.7-dind - options: --privileged # Necessário para Docker-in-Docker ou acesso ao socket - + options: --privileged + # SOLUÇÃO: Cria um daemon do Docker dedicado para este Job + services: + docker: + image: docker:24.0.7-dind + privileged: true + env: + # Aponta o CLI para o serviço sidecar em vez do socket local + DOCKER_HOST: tcp://docker:2375 + DOCKER_TLS_CERTDIR: "" + steps: - # Instala o Git rapidinho porque a imagem 'docker' é Alpine e vem sem ele - - name: Install Git - run: apk add --no-cache git + - 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 config --global core.compression 0 git clone --depth 1 --branch dev https://${{ secrets.FORGEJO_TOKEN }}@pipe.gohorsejobs.com/${{ github.repository }}.git . - name: Docker Login @@ -37,10 +47,12 @@ jobs: - name: Build & Push Backend run: | + # O Docker nativo aqui usará o daemon do service docker build --build-arg DOCKER_MTU=${{ env.DOCKER_MTU }} \ -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: | @@ -48,6 +60,7 @@ 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 @@ -57,8 +70,10 @@ jobs: container: image: alpine/k8s:1.30.0 steps: - - name: Install Git - run: apk add --no-cache git + - 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: | @@ -69,11 +84,10 @@ jobs: mkdir -p $HOME/.kube echo "${{ secrets.KUBECONFIG }}" > $HOME/.kube/config chmod 600 $HOME/.kube/config + export KUBECONFIG=$HOME/.kube/config - # Namespace kubectl create namespace gohorsejobsdev --dry-run=client -o yaml | kubectl apply -f - - # Secrets (Update if exists) kubectl -n gohorsejobsdev create secret docker-registry forgejo-registry \ --docker-server=${{ env.REGISTRY }} \ --docker-username=${{ env.IMAGE_NAMESPACE }} \ @@ -87,11 +101,12 @@ jobs: --from-literal=DATABASE_URL="${{ vars.DATABASE_URL }}" \ --dry-run=client -o yaml | kubectl apply -f - - # Deploy kubectl apply -f k8s/dev/ -n gohorsejobsdev - # 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 }} \ No newline at end of file + backoffice=${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/backoffice:${{ github.sha }} + + kubectl -n gohorsejobsdev rollout status deployment/gohorse-backend-dev --timeout=60s + kubectl -n gohorsejobsdev rollout status deployment/gohorse-backoffice-dev --timeout=60s \ No newline at end of file