From d94d417af8cf9d8a03baed976e4ca7401c869bde Mon Sep 17 00:00:00 2001 From: Marcus Date: Sat, 31 Jan 2026 11:44:42 -0300 Subject: [PATCH] ajustes --- .forgejo/workflows/deploy.yaml | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 4bef4e1..0206dd3 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -36,16 +36,19 @@ jobs: provenance: false tags: ${{ env.REGISTRY }}/bohessefm/gohorsejobs:${{ github.sha }} - # Push do Backend com config isolado + # Push do Backend com Injeção Manual de Auth - name: Push Backend Tags run: | - mkdir -p $HOME/.docker_backend - echo "${{ secrets.FORGEJO_TOKEN }}" | docker --config $HOME/.docker_backend login ${{ env.REGISTRY }} -u bohessefm --password-stdin + # Gera o Auth em Base64 (estilo Kubernetes) + AUTH=$(echo -n "bohessefm:${{ secrets.FORGEJO_TOKEN }}" | base64 | tr -d '\n') + mkdir -p $HOME/.docker + # Escreve o config.json na força bruta + echo "{\"auths\":{\"${{ env.REGISTRY }}\":{\"auth\":\"$AUTH\"}}}" > $HOME/.docker/config.json - docker --config $HOME/.docker_backend tag ${{ env.REGISTRY }}/bohessefm/gohorsejobs:${{ github.sha }} ${{ env.REGISTRY }}/bohessefm/gohorsejobs:latest - docker --config $HOME/.docker_backend push ${{ env.REGISTRY }}/bohessefm/gohorsejobs:${{ github.sha }} + docker tag ${{ env.REGISTRY }}/bohessefm/gohorsejobs:${{ github.sha }} ${{ env.REGISTRY }}/bohessefm/gohorsejobs:latest + docker push ${{ env.REGISTRY }}/bohessefm/gohorsejobs:${{ github.sha }} sleep 2 - docker --config $HOME/.docker_backend push ${{ env.REGISTRY }}/bohessefm/gohorsejobs:latest + docker push ${{ env.REGISTRY }}/bohessefm/gohorsejobs:latest # Build do Backoffice - name: Build Backoffice @@ -57,16 +60,18 @@ jobs: provenance: false tags: ${{ env.REGISTRY }}/bohessefm/backoffice:${{ github.sha }} - # Push do Backoffice com config isolado (Resolução do erro de autenticação) + # Push do Backoffice com Injeção Manual de Auth (Blindado contra 401) - name: Push Backoffice Tags run: | - mkdir -p $HOME/.docker_backoffice - echo "${{ secrets.FORGEJO_TOKEN }}" | docker --config $HOME/.docker_backoffice login ${{ env.REGISTRY }} -u bohessefm --password-stdin + # Garante que o diretório existe e o arquivo está atualizado + 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 - docker --config $HOME/.docker_backoffice tag ${{ env.REGISTRY }}/bohessefm/backoffice:${{ github.sha }} ${{ env.REGISTRY }}/bohessefm/backoffice:latest - docker --config $HOME/.docker_backoffice push ${{ env.REGISTRY }}/bohessefm/backoffice:${{ github.sha }} + docker tag ${{ env.REGISTRY }}/bohessefm/backoffice:${{ github.sha }} ${{ env.REGISTRY }}/bohessefm/backoffice:latest + docker push ${{ env.REGISTRY }}/bohessefm/backoffice:${{ github.sha }} sleep 2 - docker --config $HOME/.docker_backoffice push ${{ env.REGISTRY }}/bohessefm/backoffice:latest + docker push ${{ env.REGISTRY }}/bohessefm/backoffice:latest deploy-to-k3s: needs: build-and-push @@ -95,6 +100,7 @@ jobs: kubectl create namespace gohorsejobsdev --dry-run=client -o yaml | kubectl apply -f - + # O segredo que o K3s usa é exatamente o que injetamos no Docker acima kubectl -n gohorsejobsdev create secret docker-registry forgejo-registry \ --docker-server=${{ env.REGISTRY }} \ --docker-username=bohessefm \