From 9c720c2bf73d0a4531b86cdeb3085b396ab86a55 Mon Sep 17 00:00:00 2001 From: Marcus Date: Sat, 31 Jan 2026 12:08:04 -0300 Subject: [PATCH] ajustes --- .forgejo/workflows/deploy.yaml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index bbdf7d3..179b377 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -26,7 +26,7 @@ jobs: with: fetch-depth: 1 - # Build do Backend + # --- BACKEND --- - name: Build Backend uses: docker/build-push-action@v5 with: @@ -36,11 +36,11 @@ jobs: provenance: false tags: ${{ env.REGISTRY }}/bohessefm/gohorsejobs:${{ github.sha }} - # Push do Backend (Auth renovada antes de cada comando) - - name: Push Backend Tags + - name: Push Backend (Forced Auth) run: | docker tag ${{ env.REGISTRY }}/bohessefm/gohorsejobs:${{ github.sha }} ${{ env.REGISTRY }}/bohessefm/gohorsejobs:latest + # Injeção 1: Push da Tag SHA AUTH=$(echo -n "bohessefm:${{ secrets.FORGEJO_TOKEN }}" | base64 | tr -d '\n') mkdir -p $HOME/.docker echo "{\"auths\":{\"${{ env.REGISTRY }}\":{\"auth\":\"$AUTH\"}}}" > $HOME/.docker/config.json @@ -48,10 +48,11 @@ jobs: sleep 2 + # Injeção 2: Push da Tag Latest (Garante que não perdeu a sessão) echo "{\"auths\":{\"${{ env.REGISTRY }}\":{\"auth\":\"$AUTH\"}}}" > $HOME/.docker/config.json docker push ${{ env.REGISTRY }}/bohessefm/gohorsejobs:latest - # Build do Backoffice + # --- BACKOFFICE --- - name: Build Backoffice uses: docker/build-push-action@v5 with: @@ -61,11 +62,11 @@ jobs: provenance: false tags: ${{ env.REGISTRY }}/bohessefm/backoffice:${{ github.sha }} - # Push do Backoffice (Auth renovada antes de cada comando) - - name: Push Backoffice Tags + - name: Push Backoffice (Forced Auth) run: | docker tag ${{ env.REGISTRY }}/bohessefm/backoffice:${{ github.sha }} ${{ env.REGISTRY }}/bohessefm/backoffice:latest + # Injeção 3: Push da Tag SHA AUTH=$(echo -n "bohessefm:${{ secrets.FORGEJO_TOKEN }}" | base64 | tr -d '\n') mkdir -p $HOME/.docker echo "{\"auths\":{\"${{ env.REGISTRY }}\":{\"auth\":\"$AUTH\"}}}" > $HOME/.docker/config.json @@ -73,6 +74,7 @@ jobs: sleep 2 + # Injeção 4: Push da Tag Latest echo "{\"auths\":{\"${{ env.REGISTRY }}\":{\"auth\":\"$AUTH\"}}}" > $HOME/.docker/config.json docker push ${{ env.REGISTRY }}/bohessefm/backoffice:latest @@ -103,17 +105,15 @@ jobs: chmod 600 $HOME/.kube/config export KUBECONFIG=$HOME/.kube/config - # Garante o Namespace + # Ajuste Namespace e Secrets (Sintaxe robusta) kubectl create namespace gohorsejobsdev --dry-run=client -o yaml | kubectl apply -f - - # Recria o Image Pull Secret de forma limpa (sem pipe) 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-password="${{ secrets.FORGEJO_TOKEN }}" - # Recria os Secrets do Backend com aspas duplas para proteger os valores kubectl -n gohorsejobsdev delete secret backend-secrets --ignore-not-found kubectl -n gohorsejobsdev create secret generic backend-secrets \ --from-literal=MTU="${{ vars.MTU }}" \ @@ -121,14 +121,13 @@ jobs: --from-literal=AMQP_URL="${{ vars.AMQP_URL }}" \ --from-literal=DATABASE_URL="${{ vars.DATABASE_URL }}" - # Aplica os manifestos kubectl apply -f k8s/dev/ -n gohorsejobsdev - # Atualiza as imagens nos deployments para o SHA específico + # Set image usando o SHA para garantir que baixe a nova kubectl -n gohorsejobsdev set image deployment/gohorse-backend-dev backend=${{ env.REGISTRY }}/bohessefm/gohorsejobs:${{ github.sha }} kubectl -n gohorsejobsdev set image deployment/gohorse-backoffice-dev backoffice=${{ env.REGISTRY }}/bohessefm/backoffice:${{ github.sha }} - # Força o reinício dos pods (Uso de || true para não falhar se não houver pods) + # Force Restart 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